4cb47bd3bd
Fixed compiler warnings
2016-01-25 11:45:14 +08:00
88b9d485d6
Drop old VC support for ext/fileinfo.
...
@Anatol, I generated the updated patch file against file 5.22, since you are the one that usually updates it, can you please confirm it works?
2015-03-29 07:48:48 +02:00
bae44417a8
after merge fix
2015-03-08 19:56:31 +01:00
3e8a5485e2
catching up
2015-03-08 19:47:59 +01:00
1b77e51ad7
started to patch for libmagic.next
...
everything is broken yet
2015-03-08 19:47:38 +01:00
5892ec175a
catching up
2015-03-08 19:47:30 +01:00
ca98547801
catching up
2015-03-08 19:47:28 +01:00
ec84d36c9f
portable off_t
2015-03-08 19:47:24 +01:00
0d410fc2d2
more after patch fixes
2015-03-08 19:47:20 +01:00
2181ed2e2a
started to patch for libmagic.next
...
everything is broken yet
2015-03-08 19:47:06 +01:00
f9d672f7d4
Merge branch 'PHP-5.6'
...
* PHP-5.6:
simplify error handling for dirs as magic
2015-01-22 10:17:45 +01:00
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
43652d386a
simplify error handling for dirs as magic
2015-01-22 10:16:13 +01:00
4e3e95dfc0
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
Fixed bug #68827 Double free with disabled ZMM
2015-01-22 10:02:05 +01:00
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
91aa340180
Fixed bug #68827 Double free with disabled ZMM
2015-01-22 09:59:13 +01:00
b7a7b1a624
trailing whitespace removal
2015-01-10 15:07:38 -08:00
ef89ab2f99
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWs
Fixed bug #68665 (Invalid free)
2014-12-28 14:02:25 +01:00
a72cd07f29
Fixed bug #68665 (Invalid free)
2014-12-28 13:58:01 +01:00
bdeb220f48
first shot remove TSRMLS_* things
2014-12-13 23:06:14 +01:00
c00424e427
bring back all the TSRMLS_FETCH() stuff
...
for better comparability with the mainstream
2014-10-15 09:37:55 +02:00
26e5f9bab7
cleanup TSRMLS_FETCH in ext/fileinfo
2014-09-26 21:30:22 +02:00
90fcf0f52a
Merge branch 'PHP-5.6'
2014-09-20 16:42:31 -07:00
8312836c74
Merge branch 'PHP-5.5' into PHP-5.6
2014-09-20 16:42:12 -07:00
e64da8c20d
Fixed bug #66242 (don't assume char is signed)
...
This fixes a bug in libmagic where a cast to 'char' is assumed to result
in sign extension to occur. However, unqualified 'char' is unsigned on
architectures such as ARM, so the cast needs to be to 'signed char'
explicitly.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org >
2014-09-20 16:39:48 -07:00
4d997f63d9
master renames phase 3
2014-08-25 20:22:49 +02:00
ac6d6aebd8
ported ext/fileinfo
2014-08-19 21:35:13 +02:00
62305edc5b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
NEWS
Fixed Bug #66987 Memory corruption in fileinfo ext (bigendian)
2014-03-31 16:57:39 +02:00
2c204a55af
Fixed Bug #66987 Memory corruption in fileinfo ext (bigendian)
...
On little endian:
map->p == php_magic_database
map->magic[i] = pointer into the map
map->p == NULL
map->magic[i] = pointer to allocated memory
On big endian (ppc64, s390x, ...):
map->p != php_magic_database and map->p != NULL
map->magic[i] = pointer into a copy of the map
Trying to efree pointer in the later cause memory corruption
Thanks to dkatulek / Red Hat for the report.
2014-03-31 16:50:47 +02:00
fdaf3996af
remove PHP_API_VERSION < 20100412 check
2014-02-19 11:01:42 +01:00
967a6771d3
updated to libmagic-5.17
2014-02-19 10:02:36 +01:00
cdc1a63790
Fixed bug bug #64713 Compilation warnings in finfo
2013-04-27 13:49:50 +02:00
9de5dcad1c
fix ident
2013-04-08 15:51:22 +02:00
f3ca1155d6
Refactored the previous memleak fix
...
to avoid usage of a freed pointer. Thanks Laruence )
2013-04-08 14:32:37 +02:00
28e26b0fad
fix memory leak at apprentice.c:1095
2013-04-08 12:49:53 +02:00
b0b81c0a37
fixed EOL
2013-04-08 09:20: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
8a84b1b5d9
Backported the fix for bug #63248 from 5.4+
2012-11-23 13:58:22 +01:00
0d7965f0a3
Merge the fix for #61964 to 5.3, which will fix #63304
2012-10-18 23:29:33 +08:00
6d019deee2
Fixed bug #63248 Load multiple magic files on win
...
- adapt config.w32 to not to use dirent lib anymore
- prevent libmagic from opening a dir handle under win
- reimplement the dir iteration functionality with streams
2012-10-16 11:03:32 +02:00
328a3d9f13
regenerate patch, and save a strlen
2012-09-11 11:43:47 +08:00
0a25a0241e
Fix the wrong use of snprintf which is introduced in 1d2f619049
2012-09-10 23:08:54 +08:00
1d2f619049
Fixed bug #61964 (finfo_open with directory cause invalid free)
2012-05-25 18:55:34 +08:00
12cf930a40
Fix bug #61504 , potential vuln. in fileinfo. update to 5.11
2012-03-27 13:34:46 +02:00
72ad61733a
- Fix the fix
2011-11-22 15:12:44 +00:00
8a4d75fe85
- Fixed possible memory leak in finfo_open()
2011-11-22 15:04:19 +00:00
490b75d170
- Fixed bug #54934 (Unresolved symbol strtoull in HP-UX 11.11)
2011-05-27 23:31:30 +00:00
cb30330800
Merge safe_mode changes into extensions that are in sync in both branches
2010-04-26 23:55:03 +00:00
Xinchen Hui