From: Nikita Popov <nikic@php.net>
Date: Fri, 14 Aug 2015 15:15:56 +0000 (+0200)
Subject: Executed file can be NULL
X-Git-Tag: php-7.0.0RC1~7^2~17^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6366679906569e36c2a71f1a5c34c5b8d7946138;p=php

Executed file can be NULL

So revert this part to what it was originally.
---

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);