felipe Wed Mar 19 03:12:39 2008 UTC Modified files: /php-src/ext/standard var_unserializer.c var_unserializer.re /php-src/ext/standard/tests/serialize bug43614.phpt Log: MFB: Fixed bug #43614 (incorrect processing of numerical string keys of array in arbitrary serialized data) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.c?r1=1.93&r2=1.94&diff_format=u Index: php-src/ext/standard/var_unserializer.c diff -u php-src/ext/standard/var_unserializer.c:1.93 php-src/ext/standard/var_unserializer.c:1.94 --- php-src/ext/standard/var_unserializer.c:1.93 Wed Oct 17 10:36:45 2007 +++ php-src/ext/standard/var_unserializer.c Wed Mar 19 03:12:39 2008 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.12.1 on Mon Aug 6 21:30:07 2007 */ +/* Generated by re2c 0.12.3 on Wed Mar 19 00:06:59 2008 */ #line 1 "ext/standard/var_unserializer.re" /* +----------------------------------------------------------------------+ @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var_unserializer.c,v 1.93 2007/10/17 10:36:45 dmitry Exp $ */ +/* $Id: var_unserializer.c,v 1.94 2008/03/19 03:12:39 felipe Exp $ */ #include "php.h" #include "ext/standard/php_var.h" @@ -326,10 +326,10 @@ break; case IS_STRING: case IS_UNICODE: - if (zend_u_hash_find(ht, Z_TYPE_P(key), Z_UNIVAL_P(key), Z_UNILEN_P(key) + 1, (void **)&old_data)==SUCCESS) { + if (zend_u_symtable_find(ht, Z_TYPE_P(key), Z_UNIVAL_P(key), Z_UNILEN_P(key) + 1, (void **)&old_data)==SUCCESS) { var_push_dtor(var_hash, old_data); } - zend_u_hash_update(ht, Z_TYPE_P(key), Z_UNIVAL_P(key), Z_UNILEN_P(key) + 1, &data, sizeof(data), NULL); + zend_u_symtable_update(ht, Z_TYPE_P(key), Z_UNIVAL_P(key), Z_UNILEN_P(key) + 1, &data, sizeof(data), NULL); break; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.re?r1=1.72&r2=1.73&diff_format=u Index: php-src/ext/standard/var_unserializer.re diff -u php-src/ext/standard/var_unserializer.re:1.72 php-src/ext/standard/var_unserializer.re:1.73 --- php-src/ext/standard/var_unserializer.re:1.72 Wed Oct 17 10:36:45 2007 +++ php-src/ext/standard/var_unserializer.re Wed Mar 19 03:12:39 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var_unserializer.re,v 1.72 2007/10/17 10:36:45 dmitry Exp $ */ +/* $Id: var_unserializer.re,v 1.73 2008/03/19 03:12:39 felipe Exp $ */ #include "php.h" #include "ext/standard/php_var.h" @@ -330,10 +330,10 @@ break; case IS_STRING: case IS_UNICODE: - if (zend_u_hash_find(ht, Z_TYPE_P(key), Z_UNIVAL_P(key), Z_UNILEN_P(key) + 1, (void **)&old_data)==SUCCESS) { + if (zend_u_symtable_find(ht, Z_TYPE_P(key), Z_UNIVAL_P(key), Z_UNILEN_P(key) + 1, (void **)&old_data)==SUCCESS) { var_push_dtor(var_hash, old_data); } - zend_u_hash_update(ht, Z_TYPE_P(key), Z_UNIVAL_P(key), Z_UNILEN_P(key) + 1, &data, sizeof(data), NULL); + zend_u_symtable_update(ht, Z_TYPE_P(key), Z_UNIVAL_P(key), Z_UNILEN_P(key) + 1, &data, sizeof(data), NULL); break; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/bug43614.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/serialize/bug43614.phpt diff -u /dev/null php-src/ext/standard/tests/serialize/bug43614.phpt:1.2 --- /dev/null Wed Mar 19 03:12:39 2008 +++ php-src/ext/standard/tests/serialize/bug43614.phpt Wed Mar 19 03:12:39 2008 @@ -0,0 +1,21 @@ +--TEST-- +Bug #43614 (incorrect processing of numerical string keys of array in arbitrary serialized data) +--FILE-- +<?php + +error_reporting(E_ALL); + +var_dump($a = unserialize('a:2:{s:2:"10";i:1;s:2:"01";i:2;}')); +var_dump($a['10']); +var_dump($a['01']); + +?> +--EXPECT-- +array(2) { + [10]=> + int(1) + ["01"]=> + int(2) +} +int(1) +int(2)
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php