diff options
| author | Christoph M. Becker <cmb@php.net> | 2015-08-14 17:21:09 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmb@php.net> | 2015-08-14 17:21:09 +0200 |
| commit | 243b9f6592f7b52a8efdc5aa0759166c920d8562 (patch) | |
| tree | cb44092c58fa10bb357310aa1616b288bdf31ced | |
| parent | e13de24101f266b1a37a1b0467883e228034ca2d (diff) | |
| parent | 6366679906569e36c2a71f1a5c34c5b8d7946138 (diff) | |
| download | php-git-243b9f6592f7b52a8efdc5aa0759166c920d8562.tar.gz | |
Merge branch 'master' of https://git.php.net/repository/php-src
# By Nikita Popov
# Via Nikita Popov
* 'master' of https://git.php.net/repository/php-src:
Executed file can be NULL
| -rw-r--r-- | Zend/zend_exceptions.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index d7df5df0bf..307589b5fe 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -207,7 +207,7 @@ static zend_object *zend_default_exception_new_ex(zend_class_entry *class_type, base_ce = i_get_exception_base(&obj); if (EXPECTED(class_type != zend_ce_parse_error || !(filename = zend_get_compiled_filename()))) { - zend_update_property_str(base_ce, &obj, "file", sizeof("file")-1, zend_get_executed_filename_ex()); + zend_update_property_string(base_ce, &obj, "file", sizeof("file")-1, zend_get_executed_filename()); zend_update_property_long(base_ce, &obj, "line", sizeof("line")-1, zend_get_executed_lineno()); } else { zend_update_property_str(base_ce, &obj, "file", sizeof("file")-1, filename); |