Anatol Belski
f9d672f7d4
Merge branch 'PHP-5.6'
...
* PHP-5.6:
simplify error handling for dirs as magic
2015-01-22 10:17:45 +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
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
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
fc33f52d8c
bump year
2015-01-15 23:27:30 +08: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
Stanislav Malyshev
b7a7b1a624
trailing whitespace removal
2015-01-10 15:07:38 -08:00
Anatol Belski
4d6fb5e684
updated libmagic.patch
2015-01-04 17:09:06 +01: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
723319813b
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
updated NEWS
Fixed bug #68735 fileinfo out-of-bounds memory access
2015-01-04 14:25:28 +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
fa0b5e2c6d
updated libmagic.patch
2014-12-30 20:28:13 +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
a78eaddbe0
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
Fixed bug #68671 incorrect expression in libmagic
Conflicts:
ext/fileinfo/libmagic/print.c
2014-12-30 19:41:07 +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
ef89ab2f99
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWs
Fixed bug #68665 (Invalid free)
2014-12-28 14:02:25 +01:00
Anatol Belski
a72cd07f29
Fixed bug #68665 (Invalid free)
2014-12-28 13:58:01 +01:00
Andrea Faulds
e5eb9530ab
Use "float" and "integer" in typehint and zpp errors
2014-12-21 13:23:02 +00:00
Anatol Belski
bdeb220f48
first shot remove TSRMLS_* things
2014-12-13 23:06:14 +01:00
Remi Collet
f0f51da936
drop dead/unused code
2014-12-09 11:25:53 +01:00
Anatol Belski
aa52fcf179
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #68398 msooxml matches too many archives
2014-12-06 20:51:41 +01:00
Anatol Belski
41a2f7074d
Fixed bug #68398 msooxml matches too many archives
2014-12-06 20:51:00 +01:00
Veres Lajos
06fdf359e3
typo fixes - https://github.com/vlajos/misspell_fixer
2014-11-23 14:52:47 -08: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
71a653452f
updated libmagic.patch in master
2014-10-25 12:06:17 +02: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
1fbc93512f
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS
NEWS
Fix bug #68283 : fileinfo: out-of-bounds read in elf note headers
2014-10-25 11:31:54 +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
d8686473c2
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS
Fix bug #68224 buffer-overflow in /ext/fileinfo/libmagic/readcdf.c caught by AddressSanitizer
2014-10-22 15:27:54 +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
Nikita Popov
cf5920e8aa
Fix procedural finfo calls in methods
...
getThis() will return the $this of the calling method.
2014-10-16 14:24:23 +02:00
Ard Biesheuvel
90fcf0f52a
Merge branch 'PHP-5.6'
2014-09-20 16:42:31 -07: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
Ard Biesheuvel
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
Johannes Schlüter
d0cb715373
s/PHP 5/PHP 7/
2014-09-19 18:33:14 +02:00
Dmitry Stogov
3bc8a958c5
Fixed useless or duplicated IS_INTERNED() checks
2014-09-19 15:41:01 +04:00
Anatol Belski
f4ebeead5d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #67731 finfo::file() returns invalid mime type for binary files
2014-08-30 04:05:42 +02:00
Anatol Belski
c301467f9b
Fixed bug #67731 finfo::file() returns invalid mime type for binary files
2014-08-30 04:04:42 +02:00
Anatol Belski
bf96ee95ce
's' works with size_t round 4
2014-08-27 20:49:37 +02:00
Anatol Belski
6db8d4f829
's' works with size_t round 3
2014-08-27 20:49:36 +02:00
Anatol Belski
3234480827
first show to make 's' work with size_t
2014-08-27 20:49:31 +02:00
Anatol Belski
b63ab83256
several signature and data type fixes
2014-08-26 13:20:21 +02:00
Anatol Belski
af59e92b24
master renames phase 7
2014-08-25 21:51:49 +02:00
Anatol Belski
4d997f63d9
master renames phase 3
2014-08-25 20:22:49 +02:00
Anatol Belski
c3e3c98ec6
master renames phase 1
2014-08-25 19:24:55 +02:00
Anatol Belski
70de6180d5
fixes to %pd format usage
2014-08-24 02:35:34 +02:00
Anatol Belski
ac6d6aebd8
ported ext/fileinfo
2014-08-19 21:35:13 +02:00
Anatol Belski
63d3f0b844
basic macro replacements, all at once
2014-08-19 08:07:31 +02:00
Veres Lajos
1e3452992f
typofixes
2014-08-17 16:00:39 +03:00
Dmitry Stogov
8b66d64b23
Merge branch 'master' into phpng
...
* master:
add NEWS for 5.6 too
Fix bug #67716 - Segfault in cdf.c
Fix bug #67716 - Segfault in cdf.c
fix test
split the glob() test to test different basedir
fixed glob() edge case on windows, ref bug #47358
- fix bug #47358 , glob returns error, should be empty array()
Add NEWS entry for log() improvements
2014-08-15 08:10:08 +04:00
Stanislav Malyshev
23122ba69c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #67716 - Segfault in cdf.c
Fix bug #67716 - Segfault in cdf.c
2014-08-14 17:22:06 -07:00
Stanislav Malyshev
3468f03b6f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #67716 - Segfault in cdf.c
2014-08-14 17:21:29 -07:00
Remi Collet
35f32637b0
Fix bug #67716 - Segfault in cdf.c
2014-08-14 17:21:20 -07:00
Remi Collet
49387b31cf
Fix bug #67716 - Segfault in cdf.c
2014-08-14 17:19:03 -07:00
Dmitry Stogov
4c716e8b51
Merge branch 'master' into test
...
* master: (39 commits)
Add __debugInfo() to UPGRADING.
fix TS build
Update NEWS
Update NEWS
Update NEWS
Small tidy ups and raise visibility of GitHub PR process
Bug #41631 : Observe socket read timeouts in SSL streams
wrap int8_t and int16_t with #ifdef to avoid possible clashes
- Updated to version 2014.6 (2014f)
Removed Countable::count() change info from UPGRADE.INTERNALS too
NEWS and UPGRADING for intdiv()
Revert "Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option"
Fixed skip case for intdiv 64-bit test
Use callback structure
Add EXPECTF
Fix handling of multi-result sets with PS...used to clean not only the result set but the whole PS.
5.5.17 now
5.4.33-dev now
Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
...
Conflicts:
ext/fileinfo/libmagic/softmagic.c
main/streams/xp_socket.c
2014-08-11 11:38:41 +04:00
Andrey Hristov
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
Andrey Hristov
41e1ccefd5
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
configure.in
main/php_version.h
2014-08-06 15:27:56 +03:00
Stanislav Malyshev
28786a2f82
Fix bug #67705 (extensive backtracking in rule regular expression)
2014-08-04 00:09:15 -07:00
Stanislav Malyshev
61ec9b5b0f
add test
2014-08-04 00:08:08 -07:00
Stanislav Malyshev
eeaec70758
Fix bug #67705 (extensive backtracking in rule regular expression)
2014-08-04 00:05:40 -07:00
Dmitry Stogov
1dd07d6bf4
Partial fix that allows internal constructors to set $this to null.
...
The address of $this passed to drectly called internal constructor in execute_data->return_value.
Internal constructors should use ZEND_CTOR_MAKE_NULL() macro (insted of previous ZEND_NULL(EG(This))) to do the work.
This patch doesn't fix the problem for indirectly called constructors. e.g. parant::__construct().
2014-07-09 11:57:42 +04:00
Dmitry Stogov
bce6a36c8a
Merge branch 'master' into test
...
* master: (48 commits)
change locale - looks like not everybody has sl_SI
Fix bug #66921 - Wrong argument type hint for function intltz_from_date_time_zone
fix format
Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting)
Make sure the generator script also creates a newline at the end of file
Add newline at end of file to prevent compilation warning
Fix handling of session user module custom handlers.
Reference bug report instead of github issue in NEWS file
add more exts for Travis
Update NEWS
Fix phpdbg.1 man page installation when build != src directory
BFN for bug #67551 (php://input temp file will be located in sys_temp_dir instead of upload_tmp_dir)
reorder
restore API compatibility
finish
refactor php_stream_temp_create{,_ex} and use it for the php://input stream
refactor _php_stream_fopen_{temporary_,tmp}file()
fix length overflow of HTTP_RAW_POST_DATA
Update NEWS
Fixed bug #67215 (php-cgi work with opcache, may be segmentation fault happen)
...
Conflicts:
ext/opcache/zend_accelerator_util_funcs.c
ext/session/mod_user.c
ext/spl/spl_array.c
ext/spl/spl_dllist.c
ext/standard/file.c
ext/standard/streamsfuncs.c
ext/standard/string.c
main/streams/memory.c
2014-07-07 19:21:23 +04:00
Anatol Belski
3fd792b3b9
updated libmagic.patch in 5.6+
2014-07-01 10:28:43 +02:00
Anatol Belski
4965d1c2ce
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated libmagic.patch
2014-07-01 10:27:38 +02:00
Anatol Belski
af5f997a5d
updated libmagic.patch
2014-07-01 10:25:20 +02:00
Dmitry Stogov
dd1c68e67f
Merge branch 'master' into phpng
...
* master: (77 commits)
NEWS entry for Fix potential segfault in dns_get_record()
NEWS entry for "Fix potential segfault in dns_get_record()"
NEWS entry for Fix potential segfault in dns_get_record(
Fix potential segfault in dns_get_record()
Revert "Add optional second arg to unserialize()"
5.5.15 now
update NEWS
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.31 next
Add NEWS. This doesn't need UPGRADING (or an RFC), IMO.
Fix broken test.
Add a mime type map generation script and update the header.
Move the mime type map out of php_cli_server.c for easier generation.
Replace the CLI server's linear search for extensions with a hash table.
fix test
Remove unused included file
NEWS
NEWS
NEWS
Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec
...
Conflicts:
Zend/zend_closures.c
Zend/zend_execute.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/spl/spl_array.c
ext/standard/basic_functions.c
ext/standard/dns.c
ext/standard/var.c
2014-06-12 05:07:33 +04:00
Remi Collet
0a7e131128
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
NEWS
Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec
2014-06-10 14:36:02 +02:00
Remi Collet
12a62ce868
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec
2014-06-10 14:35:23 +02:00
Remi Collet
25b1dc917a
Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec
...
Upstream:
93e063ee37
Adapted for C standard.
2014-06-10 14:33:37 +02:00
Remi Collet
9ee147e6ff
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
NEWS
Bug #67412 fileinfo: cdf_count_chain insufficient boundary check
2014-06-10 14:24:07 +02:00
Remi Collet
ff66c90af0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Bug #67412 fileinfo: cdf_count_chain insufficient boundary check
2014-06-10 14:23:37 +02:00
Remi Collet
40ef6e07e0
Bug #67412 fileinfo: cdf_count_chain insufficient boundary check
...
Upstream:
40bade80cb
2014-06-10 14:22:04 +02:00
Remi Collet
1d6286c049
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
NEWS
Fixed Bug #67411 fileinfo: cdf_check_stream_offset insufficient boundary check
2014-06-10 14:16:39 +02:00
Remi Collet
f6fee381be
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fixed Bug #67411 fileinfo: cdf_check_stream_offset insufficient boundary check
2014-06-10 14:16:07 +02:00
Remi Collet
5c9f967999
Fixed Bug #67411 fileinfo: cdf_check_stream_offset insufficient boundary check
...
Upstream:
36fadd2984
2014-06-10 14:13:14 +02:00
Remi Collet
5e7cb43890
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
NEWS
Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size
2014-06-10 14:05:02 +02:00
Remi Collet
18ff81eb1a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size
2014-06-10 14:04:36 +02:00
Remi Collet
e77659a8c8
Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size
...
Upstream
27a14bc7ba
2014-06-10 14:02:36 +02:00
Dmitry Stogov
717839735f
Merge branch 'master' into phpng
...
* master: (29 commits)
drop exec perm on doc files
fix test for 5.4/5.5
restore correct behavior of DateTime
fix test use invalid code
add test for previous fix
NEWS
NEWS
NEWS
Fix regression introduce in fix for bug #67118
update news
update NEWS
Fix tests
Fix possible segfault depending on memory location...
Fixed startup segfault in non-debug builds Fixes issue #87
PHP 5.4/5.5 compability in phpdbg_watch.c
fix gcov data with some locales (again)
fix gcov data with some locales (again)
fix gcov data with some locales (again)
Update NEWS
Fixed startup segfault in non-debug builds Fixes issue #87
...
2014-06-05 20:54:50 +04:00
Anatol Belski
f3f22ff5c6
Fixed bug #67329 fileinfo: NULL pointer deference flaw by processing certain CDF files
2014-06-03 11:37:20 +02:00
Remi Collet
e61f7727d4
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
NEWS
Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check
2014-06-03 11:09:29 +02:00
Remi Collet
2d59b87527
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check
2014-06-03 11:09:04 +02:00
Remi Collet
4fcb9a9d1b
Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check
...
Upstream fix 6d209c1c48
.patch
Only revelant part applied
2014-06-03 11:05:00 +02:00
Xinchen Hui
91b2ddc816
Merge branch 'master' into phpng
...
Conflicts:
ext/spl/spl_array.c
ext/spl/spl_directory.c
ext/standard/formatted_print.c
2014-06-01 22:43:06 +08:00
Anatol Belski
fb991bd7fd
updated libmagic.patch for 5.6+
2014-05-27 22:39:54 +02:00
Anatol Belski
546797f329
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated libmagic.patch for 5.4+
Conflicts:
ext/fileinfo/libmagic.patch
2014-05-27 22:38:02 +02:00
Anatol Belski
d2765e4b8c
updated libmagic.patch for 5.4+
2014-05-27 22:36:12 +02:00
Stanislav Malyshev
bc87ba8ee6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
backport this piece from 5.6, related to the #66307 fix
Fixed bug #66307 Fileinfo crashes with powerpoint files
Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance degradation)
Fix bug #67327 : fileinfo: CDF infinite loop in nelements DoS
fix my last commit with some locales
2014-05-26 18:06:58 -07:00
Anatol Belski
d184f07b3c
backport this piece from 5.6, related to the #66307 fix
2014-05-26 18:05:13 -07:00
Anatol Belski
15ee33eb21
Fixed bug #66307 Fileinfo crashes with powerpoint files
2014-05-26 18:04:27 -07:00
Stanislav Malyshev
5ce11c2698
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance degradation)
Fix bug #67327 : fileinfo: CDF infinite loop in nelements DoS
2014-05-26 18:03:01 -07:00
Stanislav Malyshev
4005f06df6
Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance degradation)
...
Upstream patch: b8acc83781
2014-05-26 18:01:17 -07:00
Stanislav Malyshev
57225f09ed
Fix bug #67327 : fileinfo: CDF infinite loop in nelements DoS
...
Upstream fix: f97486ef5d
2014-05-26 17:45:14 -07:00
Dmitry Stogov
449ea00a48
Fixed ext/fileinfo conversion mistakes
2014-05-07 17:58:28 +04:00
Xinchen Hui
9ef21b7606
Refactor fileinfo
2014-05-07 13:50:29 +08:00
Anatol Belski
06ae920165
updated libmagic.patch
2014-05-04 21:34:17 +02:00
Anatol Belski
031cafd4e2
added missing stdint header, bug #66907
2014-05-04 21:26:53 +02:00
Anatol Belski
5c34146104
updated libmagic.patch for 5.6+
2014-04-24 20:16:06 +02:00
Anatol Belski
db960e82b4
updated libmagic.patch
2014-04-24 20:13:47 +02:00
Anatol Belski
d7bb09cc1d
backport this piece from 5.6, related to the #66307 fix
2014-04-24 19:50:23 +02:00
Anatol Belski
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
Anatol Belski
03fa5501a8
Fixed bug #66307 Fileinfo crashes with powerpoint files
2014-04-24 19:30:34 +02:00
Anatol Belski
aaf197180a
Fixed bug #66907 Solaris 10 is missing strcasestr and needs substitute
2014-04-15 10:26:49 -07:00
Anatol Belski
e265df460d
updated libmagic.patch
2014-03-31 17:24:15 +02:00
Remi Collet
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
Remi Collet
178eac6c98
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fixed Bug #66987 Memory corruption in fileinfo ext (bigendian)
2014-03-31 16:57:12 +02:00
Remi Collet
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
Remi Collet
5f0428e8cc
fix merge issue
2014-03-25 12:07:15 +01:00
Remi Collet
64d7dd55d3
Fix merge (5.6 already have file 5.17)
2014-03-25 11:03:59 +01:00
Remi Collet
84b0ab6d8f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fixed bug #66946 extensive backtracking in awk rule regular expression CVE-2013-7345
Fixed bug #66946 extensive backtracking in awk rule regular expression CVE-2013-7345
2014-03-25 11:01:20 +01:00
Remi Collet
4374a52e9d
Fixed bug #66946 extensive backtracking in awk rule regular expression
...
CVE-2013-7345
Applied upstream patch:
ef2329cf71
Add the magicdata.patch to track patches applied to upstream data file.
2014-03-25 11:00:33 +01:00
Remi Collet
1df558c6a0
Fixed bug #66946 extensive backtracking in awk rule regular expression
...
CVE-2013-7345
Applied upstream patch:
ef2329cf71
Add the magicdata.patch to track patches applied to upstream data file.
2014-03-25 10:58:50 +01:00
Anatol Belski
62f6c5853f
Fixes to various stream cast on win64
...
This fixes further issues on win64 with casts from the streams.
Sockets/descriptors handling was unitized. This has an impact only on
win64, php_socket_t otherwise can be feed back to int datatype.
2014-03-19 06:33:46 +01:00
Anatol Belski
8bda4c685a
updated libmagic.patch
2014-03-10 14:17:47 +01:00
Anatol Belski
6dd80946a2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated libmagic.patch
2014-03-10 14:14:01 +01:00
Anatol Belski
c17fd65165
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated libmagic.patch
2014-03-10 14:13:15 +01:00
Anatol Belski
b9d494a33b
updated libmagic.patch
2014-03-10 14:12:20 +01:00
Remi Collet
9a9add6b73
fix merge
2014-03-04 20:39:00 +01:00
Remi Collet
5d08cae346
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fixed Bug #66820 out-of-bounds memory access in fileinfo
2014-03-04 20:36:08 +01:00
Remi Collet
a33759fd27
Fixed Bug #66820 out-of-bounds memory access in fileinfo
...
Upstream fix:
447558595a
Notice, test changed, with upstream agreement:
-define OFFSET_OOB(n, o, i) ((n) < (o) || (i) >= ((n) - (o)))
+define OFFSET_OOB(n, o, i) ((n) < (o) || (i) > ((n) - (o)))
2014-03-04 20:32:52 +01:00
Remi Collet
834b719cf5
fix merge
2014-03-04 13:46:21 +01:00
Remi Collet
bc0b6e02e4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Improves fix for memory leak, keep in sync with upstream.
2014-03-04 13:43:42 +01:00
Remi Collet
731013ee8e
Improves fix for memory leak, keep in sync with upstream.
...
Previous fix:
http://git.php.net/?p=php-src.git;a=commitdiff;h=10eb0070700382f966bf260e44135e1f724a15d2
Upstream fix:
c0c0032b9e
2014-03-04 13:41:37 +01:00
Anatol Belski
b67c8b8603
updated libmagic.patch for 5.6+
2014-02-20 19:05:59 +01:00
Anatol Belski
e244e2245b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated libmagic.patch in 5.4/5
2014-02-20 19:00:36 +01:00
Anatol Belski
ce1fd72776
updated libmagic.patch in 5.4/5
2014-02-20 19:00:05 +01:00
Anatol Belski
67d281f093
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed leak introduced after CVE/upgrade
2014-02-20 18:55:05 +01:00
Anatol Belski
6d4d4155d2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed leak introduced after CVE/upgrade
2014-02-20 18:54:35 +01:00
Anatol Belski
10eb007070
fixed leak introduced after CVE/upgrade
2014-02-20 18:53:53 +01:00
Anatol Belski
6b5c9f6c5a
updated libmagic.patch
2014-02-19 11:20:24 +01:00
Anatol Belski
fdaf3996af
remove PHP_API_VERSION < 20100412 check
2014-02-19 11:01:42 +01:00
Anatol Belski
6d2cf0f2a4
expose correct libmagic version
2014-02-19 10:48:52 +01:00
Anatol Belski
4019531748
fixed tests in ext/fileinfo
2014-02-19 10:04:29 +01:00
Anatol Belski
967a6771d3
updated to libmagic-5.17
2014-02-19 10:02:36 +01:00