summaryrefslogtreecommitdiff
path: root/ext/standard
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2017-07-04 19:44:51 -0700
committerStanislav Malyshev <stas@php.net>2017-07-04 19:44:51 -0700
commit0496f5407f884d9040e52cda31c9b7a6447f5fa1 (patch)
treef8745d04161576a95795e1341662e493c752a18c /ext/standard
parent3a25a56a92ac1d0d6028a8ecd32ccf03bcd71ade (diff)
parent12107d619b4380efa8543046357af07b7733020d (diff)
downloadphp-git-0496f5407f884d9040e52cda31c9b7a6447f5fa1.tar.gz
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6: Update NEWS Fix bug #74087 Fixed parsing of strange formats with mixed month/day and time strings Fix bug #74145 - wddx parsing empty boolean tag leads to SIGSEGV Fixed bug #74111 Fix #74435: Buffer over-read into uninitialized memory Fix bug #74603 - use correct buffer size Fix bug #74651 - check EVP_SealInit as it can return -1 Update NEWS Fix bug #73807
Diffstat (limited to 'ext/standard')
-rw-r--r--ext/standard/tests/serialize/bug74111.phpt10
1 files changed, 10 insertions, 0 deletions
diff --git a/ext/standard/tests/serialize/bug74111.phpt b/ext/standard/tests/serialize/bug74111.phpt
new file mode 100644
index 0000000000..62922bea55
--- /dev/null
+++ b/ext/standard/tests/serialize/bug74111.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Bug #74111: Heap buffer overread (READ: 1) finish_nested_data from unserialize
+--FILE--
+<?php
+$s = 'O:8:"stdClass":00000000';
+var_dump(unserialize($s));
+?>
+--EXPECTF--
+Notice: unserialize(): Error at offset 25 of 23 bytes in %s on line %d
+bool(false)