dmitry Wed Oct 17 12:09:03 2007 UTC Added files: (Branch: PHP_5_3) /php-src/ext/soap/tests classmap004.phpt
Modified files: /php-src NEWS /php-src/ext/soap php_encoding.c Log: Fixed possible crash because of uninitialized value (Zdash Urf) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.29&r2=1.2027.2.547.2.965.2.30&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.29 php-src/NEWS:1.2027.2.547.2.965.2.30 --- php-src/NEWS:1.2027.2.547.2.965.2.29 Wed Oct 17 11:18:34 2007 +++ php-src/NEWS Wed Oct 17 12:09:02 2007 @@ -40,6 +40,8 @@ - Improved and cleaned CGI code. FastCGI is now always enabled and can not be disabled. See sapi/cgi/CHANGES for more details. (Dmitry) +- Fixed possible crash in ext/soap because of uninitialized value (Zdash Urf) + - Fixed bug #42919 (Unserializing of namespaced class object fails). (Dmitry) - Fixed bug #42859 (import always conflicts with internal classes). ([EMAIL PROTECTED], Dmitry) http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.21.2.37.2.2&r2=1.103.2.21.2.37.2.3&diff_format=u Index: php-src/ext/soap/php_encoding.c diff -u php-src/ext/soap/php_encoding.c:1.103.2.21.2.37.2.2 php-src/ext/soap/php_encoding.c:1.103.2.21.2.37.2.3 --- php-src/ext/soap/php_encoding.c:1.103.2.21.2.37.2.2 Sun Oct 7 05:22:06 2007 +++ php-src/ext/soap/php_encoding.c Wed Oct 17 12:09:02 2007 @@ -17,7 +17,7 @@ | Dmitry Stogov <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: php_encoding.c,v 1.103.2.21.2.37.2.2 2007/10/07 05:22:06 davidw Exp $ */ +/* $Id: php_encoding.c,v 1.103.2.21.2.37.2.3 2007/10/17 12:09:02 dmitry Exp $ */ #include <time.h> @@ -1208,9 +1208,10 @@ zval *data; zend_class_entry *old_scope; + INIT_PZVAL(&member); ZVAL_STRING(&member, name, 0); old_scope = EG(scope); - EG(scope) = Z_OBJCE_P(object); + EG(scope) = Z_OBJCE_P(object); data = Z_OBJ_HT_P(object)->read_property(object, &member, BP_VAR_IS TSRMLS_CC); if (data == EG(uninitialized_zval_ptr)) { /* Hack for bug #32455 */ @@ -1241,9 +1242,10 @@ zval member; zend_class_entry *old_scope; + INIT_PZVAL(&member); ZVAL_STRING(&member, name, 0); old_scope = EG(scope); - EG(scope) = Z_OBJCE_P(object); + EG(scope) = Z_OBJCE_P(object); Z_OBJ_HT_P(object)->unset_property(object, &member TSRMLS_CC); EG(scope) = old_scope; } else if (Z_TYPE_P(object) == IS_ARRAY) { http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/classmap004.phpt?view=markup&rev=1.1 Index: php-src/ext/soap/tests/classmap004.phpt +++ php-src/ext/soap/tests/classmap004.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php