archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 17:04:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'PHP-7.1'

Browse source 
* PHP-7.1:
  Don't update proprties inplace.
This commit is contained in:
Dmitry Stogov 2016-11-10 12:34:24 +03:00
commit f34a00dbd8
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ext/soap/soap.c
View file

@ -941,6 +941,8 @@ PHP_METHOD(SoapFault, __toString)
zend_string *str; zend_string *str;
zend_fcall_info fci; zend_fcall_info fci;
zval *this_ptr; zval *this_ptr;
zend_string *faultcode_val, *faultstring_val, *file_val;
zend_long line_val;
if (zend_parse_parameters_none() == FAILURE) { if (zend_parse_parameters_none() == FAILURE) {
return; return;
@ -964,16 +966,19 @@ PHP_METHOD(SoapFault, __toString)
zval_ptr_dtor(&fci.function_name); zval_ptr_dtor(&fci.function_name);
convert_to_string(faultcode); faultcode_val = zval_get_string(faultcode);
convert_to_string(faultstring); faultstring_val = zval_get_string(faultstring);
convert_to_string(file); file_val = zval_get_string(file);
convert_to_long(line); line_val = zval_get_long(line);
convert_to_string(&trace); convert_to_string(&trace);
str = strpprintf(0, "SoapFault exception: [%s] %s in %s:" ZEND_LONG_FMT "\nStack trace:\n%s", str = strpprintf(0, "SoapFault exception: [%s] %s in %s:" ZEND_LONG_FMT "\nStack trace:\n%s",
Z_STRVAL_P(faultcode), Z_STRVAL_P(faultstring), Z_STRVAL_P(file), Z_LVAL_P(line), ZSTR_VAL(faultcode_val), ZSTR_VAL(faultstring_val), ZSTR_VAL(file_val), line_val,
Z_STRLEN(trace) ? Z_STRVAL(trace) : "#0 {main}\n"); Z_STRLEN(trace) ? Z_STRVAL(trace) : "#0 {main}\n");
zend_string_release(file_val);
zend_string_release(faultstring_val);
zend_string_release(faultcode_val);
zval_ptr_dtor(&trace); zval_ptr_dtor(&trace);
RETVAL_STR(str); RETVAL_STR(str);