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
commit13338a8f60eecd72e8f87a1d124423c84f4066ae (patch)
treec6141eea5d05cb4728c6d177b5778ce798181be7
parent7ee407eb3780bb96df0629fef4d9c5f8f9fe9b5c (diff)
downloadphp-git-13338a8f60eecd72e8f87a1d124423c84f4066ae.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 0001e3c349..07a3ee7721 100644
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -2094,7 +2094,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;
}