a6b7fdeb2d
Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
2014-06-25 11:54:32 +02:00
f2f038046f
Fix bug #67349 : Locale::parseLocale Double Free
2014-06-25 11:51:50 +02:00
038baca3a1
Fix potential segfault in dns_get_record()
...
If the remote sends us a packet with a malformed TXT record,
we could end up trying to over-consume the packet and wander
off into overruns.
2014-06-25 11:45:15 +02:00
f11bba4929
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.31 next
Conflicts:
configure.in
main/php_version.h
2014-06-10 23:19:21 -07:00
317bcb96d0
Fix bug #66127 (Segmentation fault with ArrayObject unset)
2014-06-10 23:17:30 -07:00
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
25b1dc917a
Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec
...
Upstream:
https://github.com/file/file/commit/93e063ee374b6a75729df9e7201fb511e47e259d
Adapted for C standard.
2014-06-10 14:33:37 +02:00
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
40ef6e07e0
Bug #67412 fileinfo: cdf_count_chain insufficient boundary check
...
Upstream:
https://github.com/file/file/commit/40bade80cbe2af1d0b2cd0420cebd5d5905a2382
2014-06-10 14:22:04 +02:00
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
5c9f967999
Fixed Bug #67411 fileinfo: cdf_check_stream_offset insufficient boundary check
...
Upstream:
https://github.com/file/file/commit/36fadd29849b8087af9f4586f89dbf74ea45be67
2014-06-10 14:13:14 +02:00
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
e77659a8c8
Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size
...
Upstream
https://github.com/file/file/commit/27a14bc7ba285a0a5ebfdb55e54001aa11932b08
2014-06-10 14:02:36 +02:00
4b0b032676
Fixed bug #67399 (putenv with empty variable may lead to crash)
2014-06-08 23:09:31 -07:00
62857998c5
Fixed bug #67399 (putenv with empty variable may lead to crash)
2014-06-08 23:09:09 -07:00
af5057bea7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191
2014-06-09 07:07:07 +02:00
5c8c57aa6c
Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191
...
DOMDocument::substituteEntities needs to be set to true in order for
external entities to be parsed.
2014-06-09 07:05:23 +02:00
1b8d4695e2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add news
Bug 49898 __getCookies() method implementation
2014-06-08 19:46:12 -07:00
aebb23e4db
Bug 49898
...
__getCookies() method implementation
2014-06-08 19:36:18 -07:00
4946dc1ab9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Added support for parsing ssl certificates using GeneralizedTime format.
2014-06-08 14:19:16 -07:00
76a7fd893b
Added support for parsing ssl certificates using GeneralizedTime format.
...
fix bug #65698
fix bug #66636
2014-06-08 14:17:58 -07:00
da6abc8db4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Remove superfluous echos.
2014-06-08 13:50:41 -07:00
5fd7c2b01d
Remove superfluous echos.
2014-06-08 13:50:22 -07:00
67f1a58ac9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix test for 5.4/5.5
2014-06-05 17:34:09 +02:00
127651e9ae
fix test for 5.4/5.5
2014-06-05 17:33:40 +02:00
ab848ea400
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add test for previous fix
2014-06-05 14:00:15 +02:00
15d8c80ead
add test for previous fix
2014-06-05 14:00:00 +02:00
9ea9064779
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fix regression introduce in fix for bug #67118
2014-06-05 13:45:57 +02:00
1fe9f1e4f5
Fix regression introduce in fix for bug #67118
...
The fix was correct but break some code (at least in Horde)
This is a temporary workaround to fix regressioni in 5.4, 5.5 and 5.6
This make php_date_initialize more consistent
- on success return 1 + time initiliazed
- on failure return 0 + time = zero
which is check by DATE_CHECK_INITIALIZED by later method call
Will restore consistency with other date classes in master.
2014-06-05 13:39:46 +02:00
e2710310a0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed regression introduced by patch for bug #67072
2014-06-03 20:51:18 +02:00
20568e5028
Fixed regression introduced by patch for bug #67072
...
This applies to 5.4 and 5.5 only as a legacy fix.
2014-06-03 20:43:58 +02:00
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
4fcb9a9d1b
Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check
...
Upstream fix https://github.com/file/file/commit/6d209c1c489457397a5763bca4b28e43aac90391.patch
Only revelant part applied
2014-06-03 11:05:00 +02:00
9bb5867fad
Merge branch 'PHP-5.4' into PHP-5.5
2014-06-01 19:41:35 +08:00
38be99b739
Fixed bug #67359 (Segfault in recursiveDirectoryIterator)
2014-06-01 19:41:01 +08:00
43e3a83d51
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Check for zero-length keys in spl_array_skip_protected and don't skip them.
2014-05-29 17:53:28 +00:00
b5d9983ff4
Check for zero-length keys in spl_array_skip_protected and don't skip them.
...
Fixes bug #67360 (Missing element after ArrayObject::getIterator).
2014-05-29 17:49:32 +00:00
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
d2765e4b8c
updated libmagic.patch for 5.4+
2014-05-27 22:36:12 +02:00
a2f8c9c1ae
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
update NEWS
Fix bug #67249 : printf out-of-bounds read
2014-05-27 12:10:41 -07:00
091b7642c2
Fix bug #67249 : printf out-of-bounds read
2014-05-27 11:28:22 -07:00
91e7b3b84f
Fix #50444 : PDO-ODBC changes for 64-bit
...
This bug is also referenced in
[#61777 ](https://bugs.php.net/bug.php?id=61777 ) and is still present in
the latest stable release of the 5.5 branch. I see two tickets exist for
this problem already, and I'm just submitting these changes via github
as a reminder that this is a serious problem for anyone using PDO_ODBC
on the x64 builds.
2014-05-26 22:17:29 -07:00
d184f07b3c
backport this piece from 5.6, related to the #66307 fix
2014-05-26 18:05:13 -07:00
15ee33eb21
Fixed bug #66307 Fileinfo crashes with powerpoint files
2014-05-26 18:04:27 -07:00
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
4005f06df6
Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance degradation)
...
Upstream patch: https://github.com/file/file/commit/b8acc83781d5a24cc5101e525d15efe0482c280d
2014-05-26 18:01:17 -07:00
57225f09ed
Fix bug #67327 : fileinfo: CDF infinite loop in nelements DoS
...
Upstream fix: https://github.com/file/file/commit/f97486ef5dc3e8735440edc4fc8808c63e1a3ef0
2014-05-26 17:45:14 -07:00
70699d7f68
Update NEWs and add a test
2014-05-26 15:40:26 +08:00
19be8b676c
Fixed issue #183 (TMP_VAR is not only used once)
2014-05-26 10:10:59 +04:00
2260fca3dd
Further test fixes for the fdb2709 breakage.
2014-05-23 15:22:26 +00:00
Stanislav Malyshev