diff options
| author | Anatol Belski <ab@php.net> | 2014-08-21 13:54:15 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-21 13:54:15 +0200 |
| commit | 7ef536e4c98ef71be0273ee6c11d5e497d9a79a3 (patch) | |
| tree | 3bf9df4a55ad053bb37708c97c667ed593f169bd /Zend/zend_exceptions.c | |
| parent | 79b2852da4c630f9f0e5887e5bc0b8b46faac82b (diff) | |
| parent | 16b4d90fa99ef656557d1cb83609dda542f36637 (diff) | |
| download | php-git-7ef536e4c98ef71be0273ee6c11d5e497d9a79a3.tar.gz | |
Merge remote-tracking branch 'php/master'
Conflicts:
Zend/zend_exceptions.c
Diffstat (limited to 'Zend/zend_exceptions.c')
| -rw-r--r-- | Zend/zend_exceptions.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index 9fda5d4289..6d5aa720fa 100644 --- 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_int(&line); + convert_to_string_ex(&message); + convert_to_string_ex(&file); + convert_to_int_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_STRSIZE_P(file) > 0) ? file : NULL; line = (Z_TYPE_P(line) == IS_INT) ? 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_int(line); + convert_to_string_ex(str); + convert_to_string_ex(file); + convert_to_int_ex(line); zend_error_va(severity, (Z_STRSIZE_P(file) > 0) ? Z_STRVAL_P(file) : NULL, Z_IVAL_P(line), "Uncaught %s\n thrown", Z_STRVAL_P(str)); } else { |