Merge branch 'master' of https://git.php.net/repository/php-src

bof · Mar 19, 2015 · ecd6de1 · ecd6de1
2 parents 61e31b6 + ca78321
commit ecd6de1
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
@@ -966,6 +966,12 @@ 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);
+	convert_to_string(&trace);
+
 	str = strpprintf(0, "SoapFault exception: [%s] %s in %s:%pd\nStack trace:\n%s",
 	               Z_STRVAL_P(faultcode), Z_STRVAL_P(faultstring), Z_STRVAL_P(file), Z_LVAL_P(line),
 	               Z_STRLEN(trace) ? Z_STRVAL(trace) : "#0 {main}\n");