archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 22:18:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-5.6'

Browse source 
Conflicts:
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
This commit is contained in:
Xinchen Hui 2015-03-01 23:20:22 +08:00
commit 9dac9237ab
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ext/standard/tests/serialize/bug69139.phpt Normal file
View file

@ -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

2
ext/standard/var.c
View file

@ -1036,7 +1036,7 @@ PHP_FUNCTION(unserialize)
zend_hash_destroy(class_hash); zend_hash_destroy(class_hash);
FREE_HASHTABLE(class_hash); FREE_HASHTABLE(class_hash);
} }
zval_dtor(return_value); zval_ptr_dtor(return_value);
if (!EG(exception)) { 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); php_error_docref(NULL, E_NOTICE, "Error at offset " ZEND_LONG_FMT " of %d bytes", (zend_long)((char*)p - buf), buf_len);
} }