Fixed crash on recursive error handler invocation

dstogov · dstogov · commit f406858cc9da · 2011-05-17T12:27:21.000Z
diff --git 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;
 	}

Original file line number	Diff line number	Diff line change
`@@ -2111,7 +2111,7 @@ static void soap_error_handler(int error_num, const char *error_filename, const`
`2111`	`2111`	`_old_http_response_code = SG(sapi_headers).http_response_code;`
`2112`	`2112`	`_old_http_status_line = SG(sapi_headers).http_status_line;`
`2113`	`2113`
`2114`		`- if (!SOAP_GLOBAL(use_soap_error_handler)) {`
	`2114`	`+ if (!SOAP_GLOBAL(use_soap_error_handler) \|\| !EG(objects_store).object_buckets) {`
`2115`	`2115`	`call_old_error_handler(error_num, error_filename, error_lineno, format, args);`
`2116`	`2116`	`return;`
`2117`	`2117`	`}`