com php-src: Executed file can be NULL: Zend/zend_exceptions .c

Commit: 6366679906569e36c2a71f1a5c34c5b8d7946138 Author: Nikita Popov <nikic@php.net> Fri, 14 Aug 2015 17:15:56 +0200 Parents: 2af19fb50a593faaba53a8b0980bae93e89fbbb2 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6366679906569e36c2a71f1a5c34c5b8d7946138 Log: Executed file can be NULL So revert this part to what it was originally. Changed paths: M Zend/zend_exceptions.c Diff: diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index d7df5df..307589b 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);