Christoph M. Becker
243d5fcb1f
Add test for bug #69107 : finfo no longer detects PHP files
2016-08-08 18:43:33 +02:00
Anatol Belski
a00c2b1bf5
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix borked mainstream patch
5.5.35 now
2016-03-31 01:36:47 +02:00
Anatol Belski
4b0b1cec00
fix borked mainstream patch
2016-03-31 01:33:38 +02:00
Anatol Belski
ed707a5217
fix test to not to cause false positives
2016-03-31 01:29:05 +02:00
Anatol Belski
5272184a1e
Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file
...
The actual fix is applying the upstream patch from
6713ca45e7
2016-03-29 13:11:25 +02:00
Anatol Belski
84990ab346
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file
2016-03-29 13:11:17 +02:00
Anatol Belski
fe13566c93
Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file
...
The actual fix is applying the upstream patch from
6713ca45e7
2016-03-29 13:10:39 +02:00
Nikita Popov
471540d285
Fix intermittent failure of bug_68819_002.phpt
...
The test used rand(32, 127) to select the character, however
chr(127) results in "data" instead of the expected result, so this
test would fail in something like 1% of the runs.
Replace rand() with fixed character "a".
2016-03-02 00:34:36 +01:00
Xinchen Hui
47e7662a13
Update libmagic.patch for PHP-5.6
2016-01-25 11:25:04 +08:00
Xinchen Hui
a458a4fdc1
Fixed bug #7143 (finfo throws notice for specific python file)
...
There seems be a bug while it was changed from regexec to
preg_match_impl:
https://github.com/php/php-src/commit/46906925#diff-56e765972d18c84894ea061cfe58076aR1757
2016-01-25 11:24:44 +08:00
Lior Kaplan
49493a2dcf
Happy new year (Update copyright to 2016)
2016-01-01 19:21:47 +02:00
Anatol Belski
bc63491da8
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test
2015-04-14 15:21:47 +02:00
Anatol Belski
3803bbde24
fix test
2015-04-14 15:20:44 +02:00
Stanislav Malyshev
5776fceb16
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5: (27 commits)
fix non-standard C
update NEWS
5.4.41 next
fix CVE num
update NEWS
Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode)
fix test
fix type in fix for #69085
fix memory leak & add test
Fix tests
fix CVE num
Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability)
Fix test
Additional fix for bug #69324
More fixes for bug #69152
Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)
Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar)
Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
...
Conflicts:
ext/standard/http_fopen_wrapper.c
2015-04-14 01:05:01 -07:00
Stanislav Malyshev
0cb9d75cb6
Merge branch 'PHP-5.4.40' into PHP-5.5.24
...
* PHP-5.4.40:
Additional fix for bug #69324
More fixes for bug #69152
Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)
Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar)
Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
Fixed bug #68901 (use after free)
Fixed bug #68740 (NULL Pointer Dereference)
Fix bug #66550 (SQLite prepared statement use-after-free)
Better fix for #68601 for perf 81e9a993f2
Fix bug #68601 buffer read overflow in gd_gif_in.c
Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4"
Fixed bug #69293
Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.
2015-04-11 16:56:12 -07:00
Stanislav Malyshev
4435b9142f
Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)
2015-04-11 16:53:22 -07:00
Stanislav Malyshev
f938112c49
Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
2015-04-11 16:53:21 -07:00
Anatol Belski
979020fcad
moved the part of the test into an appropriate place
2015-02-08 14:10:52 +01:00
Anatol Belski
093a23d1c4
Fixed bug #68731 finfo_buffer doesn't extract the correct mime with some gifs
...
The fix for bug #67647 applies here, too.
2015-01-22 12:26:50 +01:00
Anatol Belski
c9d0894ec5
Fixed bug #67647 Bundled libmagic 5.17 does not detect quicktime files correctly
2015-01-22 11:48:11 +01:00
Anatol Belski
60c2621b2a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
simplify error handling for dirs as magic
2015-01-22 10:17:14 +01:00
Anatol Belski
43652d386a
simplify error handling for dirs as magic
2015-01-22 10:16:13 +01:00
Anatol Belski
d0e75bdc59
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68827 Double free with disabled ZMM
Fixed segfault while running with moodle
2015-01-22 10:00:10 +01:00
Joshua Rogers
91aa340180
Fixed bug #68827 Double free with disabled ZMM
2015-01-22 09:59:13 +01:00
Xinchen Hui
0579e8278d
bump year
2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653
Bump year
2015-01-15 23:26:03 +08:00
Anatol Belski
03ae6f22b6
updated libmagic.patch in 5.6
2015-01-04 17:07:32 +01:00
Anatol Belski
4ed261870f
updated libmagic.patch in 5.5
2015-01-04 17:05:42 +01:00
Anatol Belski
ebb98e7aeb
updated libmagic.patch in 5.4
2015-01-04 17:04:13 +01:00
Anatol Belski
28e44f9d44
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
Fixed bug #68735 fileinfo out-of-bounds memory access
2015-01-04 14:23:56 +01:00
Anatol Belski
5fe54dbaf9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #68735 fileinfo out-of-bounds memory access
2015-01-04 14:22:37 +01:00
Anatol Belski
ede59c8feb
Fixed bug #68735 fileinfo out-of-bounds memory access
2015-01-04 14:20:21 +01:00
Anatol Belski
c06f66563a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
removed dead code
Conflicts:
ext/fileinfo/libmagic/readelf.c
ext/fileinfo/libmagic/readelf.h
2015-01-04 09:42:46 +01:00
Anatol Belski
b644dcfb72
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
removed dead code
2015-01-04 09:40:56 +01:00
Remi Collet
919abf0cb1
removed dead code
2015-01-04 09:40:19 +01:00
Anatol Belski
ce6cbb3110
updated libmagic.patch
2014-12-30 20:22:51 +01:00
Anatol Belski
99162b8198
updated libmagic.patch
2014-12-30 20:21:28 +01:00
Anatol Belski
091ea62262
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68671 incorrect expression in libmagic
2014-12-30 19:38:08 +01:00
Anatol Belski
d92a87d7cb
Fixed bug #68671 incorrect expression in libmagic
2014-12-30 19:37:27 +01:00
Anatol Belski
a72cd07f29
Fixed bug #68665 (Invalid free)
2014-12-28 13:58:01 +01:00
Anatol Belski
41a2f7074d
Fixed bug #68398 msooxml matches too many archives
2014-12-06 20:51:00 +01:00
Veres Lajos
4dc994571d
typo fixes - https://github.com/vlajos/misspell_fixer
...
Conflicts:
ext/ftp/ftp.h
ext/pcre/pcrelib/pcre_printint.c
ext/pcre/pcrelib/sljit/sljitLir.c
ext/pcre/pcrelib/sljit/sljitLir.h
ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
ext/pgsql/pgsql.c
ext/phar/func_interceptors.c
ext/soap/soap.c
ext/standard/image.c
2014-11-23 14:33:43 -08:00
Anatol Belski
7e5bd4ec69
updated libmagic.patch in 5.6
2014-10-25 12:03:49 +02:00
Anatol Belski
270df3ffd6
updated libmagic.patch in 5.5
2014-10-25 12:01:58 +02:00
Remi Collet
cefa310cf9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fix bug #68283 : fileinfo: out-of-bounds read in elf note headers
2014-10-25 11:30:29 +02:00
Remi Collet
5b295bf191
Fix bug #68283 : fileinfo: out-of-bounds read in elf note headers
...
Upstream commit
39c7ac1106
CVE -2014-3710
(cherry picked from commit 1803228597
)
2014-10-25 11:29:16 +02:00
Remi Collet
1803228597
Fix bug #68283 : fileinfo: out-of-bounds read in elf note headers
...
Upstream commit
39c7ac1106
CVE -2014-3710
2014-10-22 15:37:04 +02:00
Remi Collet
ef2a2fa3a1
Fix bug #68224 buffer-overflow in /ext/fileinfo/libmagic/readcdf.c caught by AddressSanitizer
...
Upstream commit
f28fbb947e
2014-10-22 15:24:59 +02:00
Ard Biesheuvel
8312836c74
Merge branch 'PHP-5.5' into PHP-5.6
2014-09-20 16:42:12 -07:00
Ard Biesheuvel
7958793342
Merge branch 'PHP-5.4' into PHP-5.5
2014-09-20 16:40:02 -07:00