]> granicus.if.org Git - php/commitdiff
Executed file can be NULL
authorNikita Popov <nikic@php.net>
Fri, 14 Aug 2015 15:15:56 +0000 (17:15 +0200)
committerNikita Popov <nikic@php.net>
Fri, 14 Aug 2015 15:16:45 +0000 (17:16 +0200)
So revert this part to what it was originally.

Zend/zend_exceptions.c

index d7df5df0bfdaab895fe9f90c60a4010a642f16d8..307589b5fef06ee1acfa7eb85c8be147ea253583 100644 (file)
@@ -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);