Separate values before conversion

diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index 754927b577405b023b0f1ae4716865af2d545314..e632ce42d54cd9d694ca1d8b7ea7cbcba4fdaa90 100644 (file)
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -665,9 +665,9 @@ ZEND_METHOD(exception, __toString)
                _default_exception_get_entry(exception, "file", sizeof("file")-1, &file TSRMLS_CC);
                _default_exception_get_entry(exception, "line", sizeof("line")-1, &line TSRMLS_CC);
 
-               convert_to_string(&message);
-               convert_to_string(&file);
-               convert_to_long(&line);
+               convert_to_string_ex(&message);
+               convert_to_string_ex(&file);
+               convert_to_long_ex(&line);
 
                fci.size = sizeof(fci);
                fci.function_table = &Z_OBJCE_P(exception)->function_table;
@@ -894,7 +894,7 @@ ZEND_API void zend_exception_error(zend_object *ex, int severity TSRMLS_DC) /* {
                                file = zend_read_property(default_exception_ce, &zv, "file", sizeof("file")-1, 1 TSRMLS_CC);
                                line = zend_read_property(default_exception_ce, &zv, "line", sizeof("line")-1, 1 TSRMLS_CC);
 
-                               convert_to_string(file);
+                               convert_to_string_ex(file);
                                file = (Z_STRLEN_P(file) > 0) ? file : NULL;
                                line = (Z_TYPE_P(line) == IS_LONG) ? line : NULL;
                        } else {
@@ -908,9 +908,9 @@ ZEND_API void zend_exception_error(zend_object *ex, int severity TSRMLS_DC) /* {
                file = zend_read_property(default_exception_ce, &exception, "file", sizeof("file")-1, 1 TSRMLS_CC);
                line = zend_read_property(default_exception_ce, &exception, "line", sizeof("line")-1, 1 TSRMLS_CC);
 
-               convert_to_string(str);
-               convert_to_string(file);
-               convert_to_long(line);
+               convert_to_string_ex(str);
+               convert_to_string_ex(file);
+               convert_to_long_ex(line);
 
                zend_error_va(severity, (Z_STRLEN_P(file) > 0) ? Z_STRVAL_P(file) : NULL, Z_LVAL_P(line), "Uncaught %s\n  thrown", Z_STRVAL_P(str));
        } else {