com php-src: updated libmagic.patch in 5.4/5: ext/fileinfo/libmagic.patch

Commit: ce1fd72776292dd81c0e39d470631d9a3f62ddb6 Author: Anatol Belski <ab@php.net> Thu, 20 Feb 2014 19:00:05 +0100 Parents: 10eb0070700382f966bf260e44135e1f724a15d2 Branches: PHP-5.4 PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ce1fd72776292dd81c0e39d470631d9a3f62ddb6 Log: updated libmagic.patch in 5.4/5 Changed paths: M ext/fileinfo/libmagic.patch Diff: diff --git a/ext/fileinfo/libmagic.patch b/ext/fileinfo/libmagic..patch index d7fc532..c5d40e9 100644 --- a/ext/fileinfo/libmagic.patch +++ b/ext/fileinfo/libmagic.patch @@ -3000,7 +3000,7 @@ diff -u libmagic.orig/readelf.h libmagic/readelf.h typedef uint8_t Elf64_Char; diff -u libmagic.orig/softmagic.c libmagic/softmagic.c --- libmagic.orig/softmagic.c Thu Mar 21 18:45:14 2013 -+++ libmagic/softmagic.c Tue Feb 18 18:44:17 2014 ++++ libmagic/softmagic.c Thu Feb 20 18:57:46 2014 @@ -41,6 +41,11 @@ #include <stdlib.h> #include <time.h> @@ -3178,7 +3178,7 @@ diff -u libmagic.orig/softmagic.c libmagic/softmagic.c if (nbytes < offset) return 0; sbuf = ms->o.buf; -@@ -1710,19 +1689,19 @@ +@@ -1710,19 +1689,21 @@ ms->o.buf = NULL; ms->offset = 0; rv = file_softmagic(ms, s + offset, nbytes - offset, @@ -3198,11 +3198,13 @@ diff -u libmagic.orig/softmagic.c libmagic/softmagic.c if (file_printf(ms, "%s", rbuf) == -1) return -1; - free(rbuf); ++ } ++ if (rbuf) { + efree(rbuf); } return rv; -@@ -1837,6 +1816,42 @@ +@@ -1837,6 +1818,42 @@ return file_strncmp(a, b, len, flags); } @@ -3245,7 +3247,7 @@ diff -u libmagic.orig/softmagic.c libmagic/softmagic.c private int magiccheck(struct magic_set *ms, struct magic *m) { -@@ -1996,69 +2011,157 @@ +@@ -1996,69 +2013,157 @@ break; } case FILE_REGEX: {