]> granicus.if.org Git - php/commitdiff
MFH: Fixed crash on recursive error handler invocation
authorStanislav Malyshev <stas@php.net>
Fri, 27 May 2011 19:14:36 +0000 (19:14 +0000)
committerStanislav Malyshev <stas@php.net>
Fri, 27 May 2011 19:14:36 +0000 (19:14 +0000)
ext/soap/soap.c

index 0001e3c3498084534dcecf450bfe3033465c0721..07a3ee77219a59ecdf58f84018bb4b1e6ce42af9 100644 (file)
@@ -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;
        }