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
commit2ee837aa5e13d475ddfa50d946b0d1779920004c (patch)
tree23afb93ed60194c573c7f372ad1b38a4d6bb1d68
parenta417820be3b6b4971762a2b8ef852281a8b119d1 (diff)
downloadphp-git-2ee837aa5e13d475ddfa50d946b0d1779920004c.tar.gz
Fixed crash on recursive error handler invocation
-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 e7275c1c9d..6a3c56afdf 100644
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -2284,7 +2284,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;
}