dmitry Wed Aug 22 14:18:11 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/soap/tests/bugs bug42183.phpt
Modified files: /php-src NEWS /php-src/ext/soap php_encoding.c Log: Fixed bug #42183 (classmap cause crashr in non-wsdl mode) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.903&r2=1.2027.2.547.2.904&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.903 php-src/NEWS:1.2027.2.547.2.904 --- php-src/NEWS:1.2027.2.547.2.903 Wed Aug 22 13:19:47 2007 +++ php-src/NEWS Wed Aug 22 14:18:09 2007 @@ -1,6 +1,7 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? Aug 2007, PHP 5.2.4 +- Fixed bug #42183 (classmap cause crashr in non-wsdl mode). (Dmitry) - Fixed bug #42009 (is_a() and is_subclass_of() should NOT call autoload, in the same way as "instanceof" operator). (Dmitry) - Fixed bug #41904 (proc_open(): empty env array should cause empty http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.21.2.34&r2=1.103.2.21.2.35&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.34 php-src/ext/soap/php_encoding.c:1.103.2.21.2.35 --- php-src/ext/soap/php_encoding.c:1.103.2.21.2.34 Thu Jun 14 07:09:31 2007 +++ php-src/ext/soap/php_encoding.c Wed Aug 22 14:18:09 2007 @@ -17,7 +17,7 @@ | Dmitry Stogov <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: php_encoding.c,v 1.103.2.21.2.34 2007/06/14 07:09:31 dmitry Exp $ */ +/* $Id: php_encoding.c,v 1.103.2.21.2.35 2007/08/22 14:18:09 dmitry Exp $ */ #include <time.h> @@ -447,7 +447,10 @@ zend_hash_get_current_key_ex(SOAP_GLOBAL(class_map), &type_name, &type_len, &idx, 0, &pos) == HASH_KEY_IS_STRING) { /* TODO: namespace isn't stored */ - encodePtr enc = get_encoder(SOAP_GLOBAL(sdl), SOAP_GLOBAL(sdl)->target_ns, type_name); + encodePtr enc = NULL; + if (SOAP_GLOBAL(sdl)) { + enc = get_encoder(SOAP_GLOBAL(sdl), SOAP_GLOBAL(sdl)->target_ns, type_name); + } if (enc) { encode = enc; } else if (SOAP_GLOBAL(sdl)) { http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug42183.phpt?view=markup&rev=1.1 Index: php-src/ext/soap/tests/bugs/bug42183.phpt +++ php-src/ext/soap/tests/bugs/bug42183.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php