mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-12 11:23:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #54911 (Access to a undefined member in inherit SoapClient may cause Segmentation Fault)

Browse Source
This commit is contained in:
Dmitry Stogov 2011-11-28 14:20:35 +00:00
parent 878ada77a0
commit 66b38195d2
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ext/soap/soap.c
View File

@ -93,6 +93,7 @@ static void soap_error_handler(int error_num, const char *error_filename, const
zend_bool _old_in_compilation = CG(in_compilation); \
zend_bool _old_in_execution = EG(in_execution); \
zend_execute_data *_old_current_execute_data = EG(current_execute_data); \
void **_old_stack_top = EG(argument_stack)->top; \
int _bailout = 0;\
SOAP_GLOBAL(use_soap_error_handler) = 1;\
SOAP_GLOBAL(error_code) = "Client";\
@ -109,6 +110,16 @@ static void soap_error_handler(int error_num, const char *error_filename, const
!instanceof_function(Z_OBJCE_P(EG(exception)), soap_fault_class_entry TSRMLS_CC)) {\
_bailout = 1;\
}\
if (_old_stack_top != EG(argument_stack)->top) { \
while (EG(argument_stack)->prev != NULL && \
((char*)_old_stack_top < (char*)EG(argument_stack) || \
(char*) _old_stack_top > (char*)EG(argument_stack)->end)) { \
zend_vm_stack tmp = EG(argument_stack)->prev; \
efree(EG(argument_stack)); \
EG(argument_stack) = tmp; \
} \
EG(argument_stack)->top = _old_stack_top; \
} \
} zend_end_try();\
SOAP_GLOBAL(use_soap_error_handler) = _old_handler;\
SOAP_GLOBAL(error_code) = _old_error_code;\

22
ext/soap/tests/bugs/bug54911.phpt Normal file
View File

@ -0,0 +1,22 @@
--TEST--
Bug #54911 (Access to a undefined member in inherit SoapClient may cause Segmentation Fault)
--SKIPIF--
<?php require_once('skipif.inc'); ?>
--FILE--
<?php
class XSoapClient extends SoapClient {
function __doRequest($request, $location, $action, $version, $one_way=false) {
echo self::$crash;
}
}
$client = new XSoapClient(null, array('uri'=>'', 'location'=>''));
$client->__soapCall('', array());
?>
--EXPECTF--
Fatal error: Uncaught SoapFault exception: [Client] Access to undeclared static property: XSoapClient::$crash in %sbug54911.php:4
Stack trace:
#0 %sbug54911.php(4): XSoapClient::__doRequest()
#1 [internal function]: XSoapClient->__doRequest('<?xml version="...', '', '#', 1, 0)
#2 %sbug54911.php(8): SoapClient->__soapCall('', Array)
#3 {main}
thrown in %sbug54911.php on line 4