com php-src: Merge branch 'PHP-7.0' into PHP-7.1: ext/soap/soap.c

Commit: 0950550fb9aced9f223b807238c8222633882ea7 Author: Dmitry Stogov <dmitry@zend.com> Thu, 10 Nov 2016 12:34:09 +0300 Parents: 4a242b9feba0bf9e6f99873acc0504c519558341 15ac4904727d22acdb9722871ef8f4acb7ddccae Branches: PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0950550fb9aced9f223b807238c8222633882ea7 Log: Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: Don't update proprties inplace. Changed paths: MM ext/soap/soap.c Diff: diff --cc ext/soap/soap.c index 73b7616,a217028..52b4dcb --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@@ -964,16 -968,19 +966,19 @@@ PHP_METHOD(SoapFault, __toString zval_ptr_dtor(&fci.function_name); - convert_to_string(faultcode); - convert_to_string(faultstring); - convert_to_string(file); - convert_to_long(line); + faultcode_val = zval_get_string(faultcode); + faultstring_val = zval_get_string(faultstring); + file_val = zval_get_string(file); + line_val = zval_get_long(line); convert_to_string(&trace); - str = strpprintf(0, "SoapFault exception: [%s] %s in %s:%pd\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"); + zend_string_release(file_val); + zend_string_release(faultstring_val); + zend_string_release(faultcode_val); zval_ptr_dtor(&trace); RETVAL_STR(str);