com php-src: Merge remote-tracking branch 'php/master': Zend/zend_exceptions.c ext/spl/php_spl.c ext/spl/sp l_observer.c
| From: | Anatol Belski | Date: | Thu, 21 Aug 2014 11:54:15 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'php/master': Zend/zend_exceptions.c ext/spl/php_spl.c ext/spl/sp l_observer.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80708@lists.php.net to get a copy of this message | ||
Commit: 7ef536e4c98ef71be0273ee6c11d5e497d9a79a3
Author: Anatol Belski <ab@php.net> Thu, 21 Aug 2014 13:54:15 +0200
Parents: 79b2852da4c630f9f0e5887e5bc0b8b46faac82b 16b4d90fa99ef656557d1cb83609dda542f36637
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7ef536e4c98ef71be0273ee6c11d5e497d9a79a3
Log:
Merge remote-tracking branch 'php/master'
Conflicts:
Zend/zend_exceptions.c
Changed paths:
MM Zend/zend_exceptions.c
MM ext/spl/php_spl.c
MM ext/spl/spl_observer.c
Diff:
diff --cc Zend/zend_exceptions.c
index 9fda5d4,e632ce4..6d5aa72
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@@ -665,9 -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_long_ex(&line);
++ convert_to_int_ex(&line);
fci.size = sizeof(fci);
fci.function_table = &Z_OBJCE_P(exception)->function_table;
@@@ -894,9 -894,9 +894,9 @@@ ZEND_API void zend_exception_error(zend
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;
+ file = (Z_STRSIZE_P(file) > 0) ? file : NULL;
+ line = (Z_TYPE_P(line) == IS_INT) ? line : NULL;
} else {
file = NULL;
line = NULL;
@@@ -908,11 -908,11 +908,11 @@@
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_long_ex(line);
++ convert_to_int_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));
+ 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 {
zend_error(severity, "Uncaught exception '%s'",
ce_exception->name->val);
}