rrichards Thu Sep 11 14:18:27 2008 UTC Added files: (Branch: PHP_5_2) /php-src/ext/wddx/tests bug45901.phpt
Modified files: /php-src/ext/wddx wddx.c Log: MFH: fix bug #45901 (wddx_serialize_value crash with SimpleXMLElement object) add test http://cvs.php.net/viewvc.cgi/php-src/ext/wddx/wddx.c?r1=1.119.2.10.2.18&r2=1.119.2.10.2.19&diff_format=u Index: php-src/ext/wddx/wddx.c diff -u php-src/ext/wddx/wddx.c:1.119.2.10.2.18 php-src/ext/wddx/wddx.c:1.119.2.10.2.19 --- php-src/ext/wddx/wddx.c:1.119.2.10.2.18 Mon Dec 31 07:20:14 2007 +++ php-src/ext/wddx/wddx.c Thu Sep 11 14:18:27 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: wddx.c,v 1.119.2.10.2.18 2007/12/31 07:20:14 sebastian Exp $ */ +/* $Id: wddx.c,v 1.119.2.10.2.19 2008/09/11 14:18:27 rrichards Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -432,6 +432,7 @@ char *key; ulong idx; char tmp_buf[WDDX_BUF_LEN]; + HashTable *objhash; TSRMLS_FETCH(); MAKE_STD_ZVAL(fname); @@ -442,7 +443,7 @@ * array of property names to be serialized. */ if (call_user_function_ex(CG(function_table), &obj, fname, &retval, 0, 0, 1, NULL TSRMLS_CC) == SUCCESS) { - if (retval && HASH_OF(retval)) { + if (retval && (objhash = HASH_OF(retval))) { PHP_CLASS_ATTRIBUTES; PHP_SET_CLASS_ATTRIBUTES(obj); @@ -457,15 +458,15 @@ PHP_CLEANUP_CLASS_ATTRIBUTES(); - for (zend_hash_internal_pointer_reset(HASH_OF(retval)); - zend_hash_get_current_data(HASH_OF(retval), (void **)&varname) == SUCCESS; - zend_hash_move_forward(HASH_OF(retval))) { + for (zend_hash_internal_pointer_reset(objhash); + zend_hash_get_current_data(objhash, (void **)&varname) == SUCCESS; + zend_hash_move_forward(objhash)) { if (Z_TYPE_PP(varname) != IS_STRING) { php_error_docref(NULL TSRMLS_CC, E_NOTICE, "__sleep should return an array only containing the names of instance-variables to serialize."); continue; } - if (zend_hash_find(HASH_OF(obj), Z_STRVAL_PP(varname), Z_STRLEN_PP(varname)+1, (void **)&ent) == SUCCESS) { + if (zend_hash_find(objhash, Z_STRVAL_PP(varname), Z_STRLEN_PP(varname)+1, (void **)&ent) == SUCCESS) { php_wddx_serialize_var(packet, *ent, Z_STRVAL_PP(varname), Z_STRLEN_PP(varname) TSRMLS_CC); } } @@ -489,13 +490,15 @@ PHP_CLEANUP_CLASS_ATTRIBUTES(); - for (zend_hash_internal_pointer_reset(HASH_OF(obj)); - zend_hash_get_current_data(HASH_OF(obj), (void**)&ent) == SUCCESS; - zend_hash_move_forward(HASH_OF(obj))) { - if (*ent == obj) + objhash = HASH_OF(obj); + for (zend_hash_internal_pointer_reset(objhash); + zend_hash_get_current_data(objhash, (void**)&ent) == SUCCESS; + zend_hash_move_forward(objhash)) { + if (*ent == obj) { continue; + } - if (zend_hash_get_current_key_ex(HASH_OF(obj), &key, &key_len, &idx, 0, NULL) == HASH_KEY_IS_STRING) { + if (zend_hash_get_current_key_ex(objhash, &key, &key_len, &idx, 0, NULL) == HASH_KEY_IS_STRING) { char *class_name, *prop_name; zend_unmangle_property_name(key, key_len-1, &class_name, &prop_name); http://cvs.php.net/viewvc.cgi/php-src/ext/wddx/tests/bug45901.phpt?view=markup&rev=1.1 Index: php-src/ext/wddx/tests/bug45901.phpt +++ php-src/ext/wddx/tests/bug45901.phpt --TEST-- Bug #45901 (wddx_serialize_value crash with SimpleXMLElement object) --SKIPIF-- <?php if (!extension_loaded("wddx")) print "skip"; if (!extension_loaded("simplexml")) print "skip SimpleXML not present"; ?> --FILE-- <?php $xml = new SimpleXMLElement('<data></data>'); $xml->addChild('test'); echo wddx_serialize_value($xml, 'Variables') . "\n"; echo "DONE"; ?> --EXPECTF-- <wddxPacket version='1.0'><header><comment>Variables</comment></header><data><struct><var name='php_class_name'><string>SimpleXMLElement</string></var><var name='test'><struct><var name='php_class_name'><string>SimpleXMLElement</string></var></struct></var></struct></data></wddxPacket> DONE -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php