cvs: php-src /ext/soap php_encoding.c
| From: | Dmitry Stogov | Date: | Thu, 07 Jul 2005 17:29:26 +0000 |
| Subject: | cvs: php-src /ext/soap php_encoding.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-32775@lists.php.net to get a copy of this message | ||
dmitry Thu Jul 7 13:29:26 2005 EDT
Modified files:
/php-src/ext/soap php_encoding.c
Log:
Fixed SIGSEGV on decoding <any> elements
http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.98&r2=1.99&ty=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.98 php-src/ext/soap/php_encoding.c:1.99
--- php-src/ext/soap/php_encoding.c:1.98 Wed Jul 6 10:15:51 2005
+++ php-src/ext/soap/php_encoding.c Thu Jul 7 13:29:25 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov <dmitry@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_encoding.c,v 1.98 2005/07/06 14:15:51 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.99 2005/07/07 17:29:25 dmitry Exp $ */
#include <time.h>
@@ -993,9 +993,12 @@
while (node != NULL) {
if (get_zval_property(ret, (char*)node->name TSRMLS_CC) == NULL) {
zval* val = master_to_zval(get_conversion(XSD_ANYXML), node);
- while (node->next != NULL &&
+ while (Z_TYPE_P(val) == IS_STRING && node->next != NULL &&
get_zval_property(ret, (char*)node->next->name TSRMLS_CC) == NULL) {
zval* val2 = master_to_zval(get_conversion(XSD_ANYXML), node->next);
+ if (Z_TYPE_P(val2) != IS_STRING) {
+ break;
+ }
add_string_to_string(val, val, val2);
zval_ptr_dtor(&val2);
node = node->next;