[PHP-CVS] cvs: php-src(PHP_5_0) /ext/soap php_encoding.c

[Dmitry Stogov]

dmitry          Thu Jul  7 13:29:39 2005 EDT

  Modified files:              (Branch: PHP_5_0)
    /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.71.2.22&r2=1.71.2.23&ty=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.71.2.22 
php-src/ext/soap/php_encoding.c:1.71.2.23
--- php-src/ext/soap/php_encoding.c:1.71.2.22   Wed Jul  6 10:16:03 2005
+++ php-src/ext/soap/php_encoding.c     Thu Jul  7 13:29:39 2005
@@ -17,7 +17,7 @@
   |          Dmitry Stogov <[EMAIL PROTECTED]>                             |
   +----------------------------------------------------------------------+
 */
-/* $Id: php_encoding.c,v 1.71.2.22 2005/07/06 14:16:03 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.71.2.23 2005/07/07 17:29:39 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;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php