]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorDmitry Stogov <dmitry@zend.com>
Thu, 10 Nov 2016 09:34:09 +0000 (12:34 +0300)
committerDmitry Stogov <dmitry@zend.com>
Thu, 10 Nov 2016 09:34:09 +0000 (12:34 +0300)
* PHP-7.0:
  Don't update proprties inplace.

1  2 
ext/soap/soap.c

diff --cc ext/soap/soap.c
index 73b7616437fcc61c8e6891aa1b11501c4703b7c4,a2170283c8b7be4a0de9779de31c1483df85db72..52b4dcbef491ce13948aaaf03bf175e69ea806ef
@@@ -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);