ed707a5217
fix test to not to cause false positives
2016-03-31 01:29:05 +02:00
5272184a1e
Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file
...
The actual fix is applying the upstream patch from
https://github.com/file/file/commit/6713ca45e7757297381f4b4cdb9cf5e624a9ad36
2016-03-29 13:11:25 +02:00
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
fe13566c93
Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file
...
The actual fix is applying the upstream patch from
https://github.com/file/file/commit/6713ca45e7757297381f4b4cdb9cf5e624a9ad36
2016-03-29 13:10:39 +02:00
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
bc63491da8
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test
2015-04-14 15:21:47 +02:00
3803bbde24
fix test
2015-04-14 15:20:44 +02:00
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
4435b9142f
Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)
2015-04-11 16:53:22 -07:00
f938112c49
Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
2015-04-11 16:53:21 -07:00
979020fcad
moved the part of the test into an appropriate place
2015-02-08 14:10:52 +01:00
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
c9d0894ec5
Fixed bug #67647 Bundled libmagic 5.17 does not detect quicktime files correctly
2015-01-22 11:48:11 +01:00
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
ede59c8feb
Fixed bug #68735 fileinfo out-of-bounds memory access
2015-01-04 14:20:21 +01:00
41a2f7074d
Fixed bug #68398 msooxml matches too many archives
2014-12-06 20:51:00 +01:00
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
c301467f9b
Fixed bug #67731 finfo::file() returns invalid mime type for binary files
2014-08-30 04:04:42 +02:00
3dc9bef819
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
ext/fileinfo/data_file.c
ext/fileinfo/libmagic/softmagic.c
ext/fileinfo/magicdata.patch
2014-08-06 16:25:12 +03:00
61ec9b5b0f
add test
2014-08-04 00:08:08 -07:00
15ee33eb21
Fixed bug #66307 Fileinfo crashes with powerpoint files
2014-05-26 18:04:27 -07:00
74ce9da5dc
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #66307 Fileinfo crashes with powerpoint files
Conflicts:
ext/fileinfo/libmagic/readcdf.c
2014-04-24 19:33:54 +02:00
03fa5501a8
Fixed bug #66307 Fileinfo crashes with powerpoint files
2014-04-24 19:30:34 +02:00
4019531748
fixed tests in ext/fileinfo
2014-02-19 10:04:29 +01:00
967a6771d3
updated to libmagic-5.17
2014-02-19 10:02:36 +01:00
89f864c547
Fixed Bug #66731 file: infinite recursion
...
Upstream commit (available in file-5.17)
https://github.com/glensc/file/commit/3c081560c23f20b2985c285338b52c7aae9fdb0f
https://github.com/glensc/file/commit/cc9e74dfeca5265ad725acc926ef0b8d2a18ee70
2014-02-18 13:54:33 +01:00
35101e9ef4
a few typofixes
2014-02-14 14:51:10 +02:00
8d86597d73
non living code related typo fixes
2013-08-04 16:05:36 -07:00
e9a95d78ef
typo fixes
2013-07-15 00:23:03 -07:00
ac40c0b562
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:20:18 -07:00
bcdac7526d
reduced the file size even more
...
the first second is what at least has to be
2013-05-25 00:09:32 +02:00
2d386db878
Fixed bug #64916 finfo testcase contains copyrighted music.
...
I wasn't able to produce a file causing exactly the same crash.
However the first three seconds of the originally reported
file are pretty enough to repro bug #64830 . That reduces its
size to 72k.
2013-05-24 23:58:31 +02:00
74555e7c26
Fixed bug #64830 mimetype detection segfaults on mp3 file
2013-05-14 09:40:43 +02:00
10367fa7c6
upgraded libmagic to 5.14
2013-04-07 22:15:56 +02:00
d88017e992
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
Conflicts:
NEWS
ext/fileinfo/libmagic.patch
ext/fileinfo/tests/finfo_open_error-win32.phpt
2012-11-27 16:45:25 +01:00
e6b727d3b7
Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
2012-11-27 16:33:58 +01:00
0d7965f0a3
Merge the fix for #61964 to 5.3, which will fix #63304
2012-10-18 23:29:33 +08:00
1916bb223e
Merge branch 'pull-request/91' into PHP-5.4
...
* pull-request/91:
Fixed bug #61964 (finfo_open with directory cause invalid free)
2012-07-14 18:52:24 -07:00
cf91b163e1
fixed the test for warnings changed
2012-07-12 18:24:38 +02:00
3faebe2bec
Fix bug #62270 Test bug - ext/fileinfo/tests/finfo_open_error-win32
2012-06-14 17:59:39 +02:00
c0e046a130
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt
Bug #62177 deactivate the linux test version on win
Fix bug #62177 Test Bug - finfo_file_regex.phpt
2012-05-29 16:43:20 +02:00
ad0371ac7e
Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt
2012-05-29 16:38:57 +02:00
b4b0aaae93
Bug #62177 deactivate the linux test version on win
2012-05-29 16:37:19 +02:00
dbc727373c
Fix bug #62177 Test Bug - finfo_file_regex.phpt
2012-05-29 16:31:47 +02:00
1d2f619049
Fixed bug #61964 (finfo_open with directory cause invalid free)
2012-05-25 18:55:34 +08:00
84b2c39920
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Fixed magic file regex support
2012-05-24 13:43:35 -03:00
11b4f3becd
- Fixed magic file regex support
2012-05-24 13:42:47 -03:00
da1b534601
Fix bug #61811 three of finfo tests failed, see also #61812 .
...
The remaining two was assidentially merged back from 5.4
2012-04-22 19:26:54 +02:00
909713e233
Bug #61566 Fileinfo ext\fileinfo\tests\finfo_file_002.phpt fails
...
This patch fixes the failure caused by the
posix lseek and read versions under windows in cdf_read() .
Additionally all the occurences of lseek and read
was replaced by _lseek and _reed for windows.
2012-04-02 17:22:46 +02:00
d0e3289d12
- fix test for 5.11
2012-03-27 14:01:38 +02:00
Anatol Belski