summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@php.net>2011-05-17 12:27:21 +0000
committerDmitry Stogov <dmitry@php.net>2011-05-17 12:27:21 +0000
commitf406858cc9da5b6348d7e8568e34cdda7a034a21 (patch)
tree7c9da07edd235eac47120b23feeb471b47e4b880
parent13879d1d133fbac0c962026e615285a2e3470875 (diff)
downloadphp-git-PHP-5.2.tar.gz
Fixed crash on recursive error handler invocationPHP-5.2
-rw-r--r--ext/soap/soap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index 5929c2e24b..2ec70ac192 100644
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -2111,7 +2111,7 @@ static void soap_error_handler(int error_num, const char *error_filename, const
_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;
}