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

[Dmitry Stogov]

dmitry          Tue Oct 11 06:16:05 2005 EDT

  Modified files:              
    /php-src/ext/soap   php_encoding.c 
  Log:
  Fixed bug #32455 (wrong setting property to unset value)
  
  
http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.112&r2=1.113&ty=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.112 
php-src/ext/soap/php_encoding.c:1.113
--- php-src/ext/soap/php_encoding.c:1.112       Sun Oct  9 08:42:06 2005
+++ php-src/ext/soap/php_encoding.c     Tue Oct 11 06:16:03 2005
@@ -17,7 +17,7 @@
   |          Dmitry Stogov <[EMAIL PROTECTED]>                             |
   +----------------------------------------------------------------------+
 */
-/* $Id: php_encoding.c,v 1.112 2005/10/09 12:42:06 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.113 2005/10/11 10:16:03 dmitry Exp $ */
 
 #include <time.h>
 
@@ -991,10 +991,18 @@
                old_scope = EG(scope);
          EG(scope) = Z_OBJCE_P(object);
                data = Z_OBJ_HT_P(object)->read_property(object, &member, 
BP_VAR_IS TSRMLS_CC);
-               EG(scope) = old_scope;
                if (data == EG(uninitialized_zval_ptr)) {
+                       /* Hack for bug #32455 */
+                       zend_property_info *property_info;
+
+                       property_info = 
zend_get_property_info(Z_OBJCE_P(object), &member, 1 TSRMLS_CC);
+                       EG(scope) = old_scope;
+                       if (property_info && 
zend_hash_quick_exists(Z_OBJPROP_P(object), property_info->name, 
property_info->name_length+1, property_info->h)) {
+                               return data;
+                       }
                        return NULL;
                }
+               EG(scope) = old_scope;
                return data;
        } else if (Z_TYPE_P(object) == IS_ARRAY) {
                zval **data_ptr;



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