mirror of
https://github.com/php/php-src.git
synced 2026-10-29 18:24:57 +08:00
Merge branch 'PHP-5.6'
Conflicts: ext/standard/var_unserializer.c ext/standard/var_unserializer.re
This commit is contained in:
commit
9dac9237ab
2 files changed
+11
-1
No files matched your search
@@ -0,0 +1,10 @@
|
||||
--TEST--
|
||||
Bug #69139 (Crash in gc_zval_possible_root on unserialize)
|
||||
--FILE--
|
||||
<?php
|
||||
$str = 'a:1126666:{i:0;r:1;i:-09610;r:1;i:-0;i:0;i:0;O:1:"A":2119X:i:0;i:0;i:0;i:0;i:0;O:1:"A":2116:{i:0;r:5;i:-096766610;r:1;i:-610;r:1;i:0;i:0;';
|
||||
@unserialize($str);
|
||||
echo "Alive";
|
||||
?>
|
||||
--EXPECT--
|
||||
Alive
|
||||
+1
-1
@@ -1036,7 +1036,7 @@ PHP_FUNCTION(unserialize)
|
||||
zend_hash_destroy(class_hash);
|
||||
FREE_HASHTABLE(class_hash);
|
||||
}
|
||||
zval_dtor(return_value);
|
||||
zval_ptr_dtor(return_value);
|
||||
if (!EG(exception)) {
|
||||
php_error_docref(NULL, E_NOTICE, "Error at offset " ZEND_LONG_FMT " of %d bytes", (zend_long)((char*)p - buf), buf_len);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user