dmitry Wed Oct 17 12:08:46 2007 UTC
Added files: (Branch: PHP_5_2)
/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.975&r2=1.2027.2.547.2.976&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.975 php-src/NEWS:1.2027.2.547.2.976
--- php-src/NEWS:1.2027.2.547.2.975 Wed Oct 17 11:17:46 2007
+++ php-src/NEWS Wed Oct 17 12:08:45 2007
@@ -9,6 +9,7 @@
array_uintersect_assoc(), array_diff_key(), array_diff_assoc() and
array_udiff_assoc(). (Dmitry)
+- Fixed possible crash in ext/soap because of uninitialized value. (Zdash Urf)
- Fixed regression in glob() when enforcing safe_mode/open_basedir checks on
paths containing '*'. (Ilia)
- Fixed "mail.force_extra_parameters" php.ini directive not to be modifiable
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.21.2.37&r2=1.103.2.21.2.38&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
php-src/ext/soap/php_encoding.c:1.103.2.21.2.38
--- php-src/ext/soap/php_encoding.c:1.103.2.21.2.37 Wed Sep 5 10:18:22 2007
+++ php-src/ext/soap/php_encoding.c Wed Oct 17 12:08:45 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_encoding.c,v 1.103.2.21.2.37 2007/09/05 10:18:22 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.103.2.21.2.38 2007/10/17 12:08:45 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
