Skip to content

Fixed bug #70469 SoapClient's fatal error in error_get_last() #2899

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fixed bug #70469 SoapClient's fatal error in error_get_last() #2899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 0 additions & 23 deletions ext/soap/soap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2167,11 +2167,6 @@ static void soap_error_handler(int error_num, const char *error_filename, const
int buffer_len;
#ifdef va_copy
va_list argcopy;
#endif
zend_object **old_objects;
int old = PG(display_errors);

#ifdef va_copy
va_copy(argcopy, args);
buffer_len = vslprintf(buffer, sizeof(buffer)-1, format, argcopy);
va_end(argcopy);
Expand All @@ -2189,24 +2184,6 @@ static void soap_error_handler(int error_num, const char *error_filename, const
add_soap_fault_ex(&fault, &SOAP_GLOBAL(error_object), code, buffer, NULL, NULL);
Z_ADDREF(fault);
zend_throw_exception_object(&fault);

old_objects = EG(objects_store).object_buckets;
EG(objects_store).object_buckets = NULL;
PG(display_errors) = 0;
SG(sapi_headers).http_status_line = NULL;
zend_try {
call_old_error_handler(error_num, error_filename, error_lineno, format, args);
} zend_catch {
CG(in_compilation) = _old_in_compilation;
EG(current_execute_data) = _old_current_execute_data;
if (SG(sapi_headers).http_status_line) {
efree(SG(sapi_headers).http_status_line);
}
SG(sapi_headers).http_status_line = _old_http_status_line;
SG(sapi_headers).http_response_code = _old_http_response_code;
} zend_end_try();
EG(objects_store).object_buckets = old_objects;
PG(display_errors) = old;
zend_bailout();
} else if (!use_exceptions ||
!SOAP_GLOBAL(error_code) ||
Expand Down
20 changes: 20 additions & 0 deletions ext/soap/tests/bugs/bug70469.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
--TEST--
Bug #70469 (SoapClient should not generate E_ERROR if exceptions enabled)
--SKIPIF--
<?php require_once('skipif.inc'); ?>
--FILE--
<?php
try {
$x = new SoapClient('http://i_dont_exist.com/some.wsdl');
} catch (SoapFault $e) {
echo "catched\n";
}

$error = error_get_last();
if ($error === null) {
echo "ok\n";
}
?>
--EXPECT--
catched
ok