diff options
| author | Andrey Hristov <andrey@php.net> | 2013-05-14 13:01:18 +0200 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2013-05-14 13:01:18 +0200 |
| commit | 1f97fde89e5e54c4f360b07d348d0f14634808b3 (patch) | |
| tree | b6d809dc0cee91adcbeeb44f833cd65bda8a6d3c | |
| parent | 9d2dda90588cbc9dbf76db30389490cd37d097d9 (diff) | |
| parent | 75ee1a6113600f3f09945a52a56417b33f454fe3 (diff) | |
| download | php-git-1f97fde89e5e54c4f360b07d348d0f14634808b3.tar.gz | |
Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5
| -rw-r--r-- | ext/fileinfo/libmagic.patch | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ext/fileinfo/libmagic.patch b/ext/fileinfo/libmagic.patch index ced3b2bb51..97e771e920 100644 --- a/ext/fileinfo/libmagic.patch +++ b/ext/fileinfo/libmagic.patch @@ -2978,7 +2978,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 2013-03-21 18:45:14.000000000 +0100 -+++ libmagic/softmagic.c 2013-04-08 15:42:57.328298809 +0200 ++++ libmagic/softmagic.c 2013-05-14 11:00:07.044745939 +0200 @@ -41,6 +41,11 @@ #include <stdlib.h> #include <time.h> @@ -3123,7 +3123,7 @@ diff -u libmagic.orig/softmagic.c libmagic/softmagic.c } } -@@ -1717,9 +1694,9 @@ +@@ -1717,12 +1694,12 @@ ms->o.buf = sbuf; ms->offset = soffset; if (rv == 1) { @@ -3134,7 +3134,11 @@ diff -u libmagic.orig/softmagic.c libmagic/softmagic.c + return -1; if (file_printf(ms, "%s", rbuf) == -1) return -1; - free(rbuf); +- free(rbuf); ++ efree(rbuf); + } + return rv; + @@ -1837,6 +1814,42 @@ return file_strncmp(a, b, len, flags); } |