Skip to content

Commit b7c5813

Browse files
authored
Update libmagic to 5.45 (php#13369)
* Update libmagic to 5.45 This also cleans up magicdata.patch: changes that are already in upstream file were removed from that patch file. There are five (expected) test output changes. All these were also checked with the file command. - bug77961.phpt changes because there's now an early error-return in the `if (ts == FILE_BADSIZE) {` branch. - cve-2014-1943.phpt and cve-2014-1943-mb.phpt change because now the crafted data is recognised as a simh file. - bug71434.phpt now properly recognises it as a Python file. - ext/fileinfo/tests/finfo_file_basic.phpt more specific mime type. * Adjust memory requirement for s390x fileinfo run The larger database causes a higher memory usage. Similar to 962c082. * [ci skip] NEWS
1 parent 6869166 commit b7c5813

35 files changed

+126761
-91230
lines changed

NEWS

+3
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ PHP NEWS
3232
. Handle OOM more consistently. (nielsdos)
3333
. Implemented "Improve callbacks in ext/dom and ext/xsl" RFC. (nielsdos)
3434

35+
- Fileinfo:
36+
. Update to libmagic 5.45. (nielsdos)
37+
3538
- FPM:
3639
. Implement GH-12385 (flush headers without body when calling flush()).
3740
(nielsdos)

ext/fileinfo/config.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if test "$PHP_FILEINFO" != "no"; then
1010
libmagic/apprentice.c libmagic/apptype.c libmagic/ascmagic.c \
1111
libmagic/cdf.c libmagic/cdf_time.c libmagic/compress.c \
1212
libmagic/encoding.c libmagic/fsmagic.c libmagic/funcs.c \
13-
libmagic/is_json.c libmagic/is_tar.c libmagic/magic.c libmagic/print.c \
13+
libmagic/is_json.c libmagic/is_tar.c libmagic/is_simh.c libmagic/magic.c libmagic/print.c \
1414
libmagic/readcdf.c libmagic/softmagic.c libmagic/der.c \
1515
libmagic/buffer.c libmagic/is_csv.c"
1616

ext/fileinfo/config.w32

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if (PHP_FILEINFO != 'no') {
66
LIBMAGIC_SOURCES=" apprentice.c apptype.c ascmagic.c \
77
cdf.c cdf_time.c compress.c \
88
encoding.c fsmagic.c funcs.c \
9-
is_json.c is_tar.c magic.c print.c \
9+
is_json.c is_tar.c is_simh.c magic.c print.c \
1010
readcdf.c softmagic.c der.c \
1111
strcasestr.c buffer.c is_csv.c";
1212

0 commit comments

Comments
 (0)