svn: /php/php-src/ branches/PHP_5_2/ext/soap/soap.c branches/PHP_5_3/ext/soap/soap.c trunk/ext/soap/soap.c
| From: | Dmitry Stogov | Date: | Tue, 17 May 2011 12:27:21 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_2/ext/soap/soap.c branches/PHP_5_3/ext/soap/soap.c trunk/ext/soap/soap.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-64969@lists.php.net to get a copy of this message | ||
dmitry Tue, 17 May 2011 12:27:21 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=311125
Log:
Fixed crash on recursive error handler invocation
Changed paths:
U php/php-src/branches/PHP_5_2/ext/soap/soap.c
U php/php-src/branches/PHP_5_3/ext/soap/soap.c
U php/php-src/trunk/ext/soap/soap.c
Modified: php/php-src/branches/PHP_5_2/ext/soap/soap.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/soap/soap.c 2011-05-17 11:43:55 UTC (rev 311124)
+++ php/php-src/branches/PHP_5_2/ext/soap/soap.c 2011-05-17 12:27:21 UTC (rev 311125)
@@ -2111,7 +2111,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;
}
Modified: php/php-src/branches/PHP_5_3/ext/soap/soap.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/soap/soap.c 2011-05-17 11:43:55 UTC (rev 311124)
+++ php/php-src/branches/PHP_5_3/ext/soap/soap.c 2011-05-17 12:27:21 UTC (rev 311125)
@@ -2284,7 +2284,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;
}
Modified: php/php-src/trunk/ext/soap/soap.c
===================================================================
--- php/php-src/trunk/ext/soap/soap.c 2011-05-17 11:43:55 UTC (rev 311124)
+++ php/php-src/trunk/ext/soap/soap.c 2011-05-17 12:27:21 UTC (rev 311125)
@@ -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;
}