]> granicus.if.org Git - php/commitdiff
Fixed crash on recursive error handler invocation
authorDmitry Stogov <dmitry@php.net>
Tue, 17 May 2011 12:27:21 +0000 (12:27 +0000)
committerDmitry Stogov <dmitry@php.net>
Tue, 17 May 2011 12:27:21 +0000 (12:27 +0000)
ext/soap/soap.c

index e7275c1c9ddb2e7e815782a24cf9fbbfafcca422..6a3c56afdf508b347bbf4ea675221f436a583d73 100644 (file)
@@ -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;
        }