cvs: php-src(PHP_5_1) / NEWS /ext/xmlrpc xmlrpc-epi-php.c

tony2001 Tue Oct 4 07:18:02 2005 EDT Modified files: (Branch: PHP_5_1) /php-src NEWS /php-src/ext/xmlrpc xmlrpc-epi-php.c Log: fix #32179 (xmlrpc_encode() segfaults with recursive references) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.90&r2=1.2027.2.91&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.90 php-src/NEWS:1.2027.2.91 --- php-src/NEWS:1.2027.2.90 Mon Oct 3 05:11:11 2005 +++ php-src/NEWS Tue Oct 4 07:18:01 2005 @@ -144,6 +144,7 @@ seg fault). (Dmitry) - Fixed bug #32937 (open_basedir looses trailing / in the limiter). (Adam Conrad) - Fixed bug #32589 (possible crash inside imap_mail_compose() function). (Ilia) +- Fixed bug #32179 (xmlrpc_encode() segfaults with recursive references). (Tony) - Fixed bug #32139 (SOAP client does not auto-handle base64 encoding). (Ilia) - Fixed bug #32010 (Memory leak in mssql_fetch_batch). (fmk) - Fixed bug #29334 (win32 mail() provides incorrect Date: header). (Jani) http://cvs.php.net/diff.php/php-src/ext/xmlrpc/xmlrpc-epi-php.c?r1=1.39&r2=1.39.2.1&ty=u Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39 php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.1 --- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39 Wed Aug 3 10:08:22 2005 +++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Tue Oct 4 07:18:02 2005 @@ -51,7 +51,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xmlrpc-epi-php.c,v 1.39 2005/08/03 14:08:22 sniper Exp $ */ +/* $Id: xmlrpc-epi-php.c,v 1.39.2.1 2005/10/04 11:18:02 tony2001 Exp $ */ /********************************************************************** * BUGS: * @@ -520,28 +520,41 @@ unsigned long num_index; zval** pIter; char* my_key; + HashTable *ht = NULL; + ht = HASH_OF(val); + if (ht && ht->nApplyCount > 1) { + php_error_docref(NULL TSRMLS_CC, E_ERROR, "XML-RPC doesn't support circular references"); + return NULL; + } + convert_to_array(val); - xReturn = XMLRPC_CreateVector(key, determine_vector_type(Z_ARRVAL_P(val))); zend_hash_internal_pointer_reset(Z_ARRVAL_P(val)); - while(1) { + while(zend_hash_get_current_data(Z_ARRVAL_P(val), (void**)&pIter) == SUCCESS) { int res = my_zend_hash_get_current_key(Z_ARRVAL_P(val), &my_key, &num_index); - if(res == HASH_KEY_IS_LONG) { - if(zend_hash_get_current_data(Z_ARRVAL_P(val), (void**)&pIter) == SUCCESS) { - XMLRPC_AddValueToVector(xReturn, PHP_to_XMLRPC_worker(0, *pIter, depth++)); - } - } - else if(res == HASH_KEY_NON_EXISTANT) { - break; + + switch (res) { + case HASH_KEY_NON_EXISTANT: + break; + case HASH_KEY_IS_STRING: + case HASH_KEY_IS_LONG: + ht = HASH_OF(*pIter); + if (ht) { + ht->nApplyCount++; + } + if (res == HASH_KEY_IS_LONG) { + XMLRPC_AddValueToVector(xReturn, PHP_to_XMLRPC_worker(0, *pIter, depth++)); + } + else { + XMLRPC_AddValueToVector(xReturn, PHP_to_XMLRPC_worker(my_key, *pIter, depth++)); + } + if (ht) { + ht->nApplyCount--; + } + break; } - else if(res == HASH_KEY_IS_STRING) { - if(zend_hash_get_current_data(Z_ARRVAL_P(val), (void**)&pIter) == SUCCESS) { - XMLRPC_AddValueToVector(xReturn, PHP_to_XMLRPC_worker(my_key, *pIter, depth++)); - } - } - zend_hash_move_forward(Z_ARRVAL_P(val)); } }