dmitry Tue Oct 11 06:15:41 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/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/NEWS?r1=1.2027.2.115&r2=1.2027.2.116&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.115 php-src/NEWS:1.2027.2.116
--- php-src/NEWS:1.2027.2.115 Tue Oct 11 02:47:47 2005
+++ php-src/NEWS Tue Oct 11 06:15:38 2005
@@ -174,6 +174,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 #32455 (wrong setting property to unset value). (Dmitry)
- 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)
http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.103.2.8&r2=1.103.2.9&ty=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.103.2.8
php-src/ext/soap/php_encoding.c:1.103.2.9
--- php-src/ext/soap/php_encoding.c:1.103.2.8 Sun Oct 9 08:41:44 2005
+++ php-src/ext/soap/php_encoding.c Tue Oct 11 06:15:40 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_encoding.c,v 1.103.2.8 2005/10/09 12:41:44 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.103.2.9 2005/10/11 10:15:40 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
