svn: /php/php-src/branches/PHP_5_4/ext/soap/ soap.c
| From: | Stanislav Malyshev | Date: | Fri, 27 May 2011 19:14:36 +0000 |
| Subject: | svn: /php/php-src/branches/PHP_5_4/ext/soap/ soap.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-65046@lists.php.net to get a copy of this message | ||
stas Fri, 27 May 2011 19:14:36 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=311506
Log:
MFH: Fixed crash on recursive error handler invocation
Changed paths:
U php/php-src/branches/PHP_5_4/ext/soap/soap.c
Modified: php/php-src/branches/PHP_5_4/ext/soap/soap.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/soap/soap.c 2011-05-27 16:32:27 UTC (rev 311505)
+++ php/php-src/branches/PHP_5_4/ext/soap/soap.c 2011-05-27 19:14:36 UTC (rev 311506)
@@ -2094,7 +2094,7 @@
_old_http_response_code = SG(sapi_headers).http_response_code;
_old_http_status_line = SG(sapi_headers).http_status_line;
- if (!SOAP_GLOBAL(use_soap_error_handler)) {
+ if (!SOAP_GLOBAL(use_soap_error_handler) || !EG(objects_store).object_buckets) {
call_old_error_handler(error_num, error_filename, error_lineno, format, args);
return;
}