diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-11-02 12:12:40 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-11-02 12:12:40 +0800 |
| commit | 3fa0cee640bd54a500fcaa8aa8293a255d0d3191 (patch) | |
| tree | 2f3c4fe063b1f204231facf5c4d9cdf21808c0ae /Zend/zend_exceptions.c | |
| parent | 39845250f242b7739d30b4b8a287b4a6130d8fa1 (diff) | |
| download | php-git-3fa0cee640bd54a500fcaa8aa8293a255d0d3191.tar.gz | |
Revert "Use zend_get_executed_filename_ex"
This reverts commit 2a37625c20032d54af55a88d54d1a3a1ecc068d1.
Diffstat (limited to 'Zend/zend_exceptions.c')
| -rw-r--r-- | Zend/zend_exceptions.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index 20eb3c5200..c892f701e3 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -222,8 +222,9 @@ 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()))) { - ZVAL_STR(&tmp, zend_get_executed_filename_ex()); + ZVAL_STRING(&tmp, zend_get_executed_filename()); zend_update_property_ex(base_ce, &obj, ZSTR_KNOWN(ZEND_STR_FILE), &tmp); + zval_ptr_dtor(&tmp); ZVAL_LONG(&tmp, zend_get_executed_lineno()); zend_update_property_ex(base_ce, &obj, ZSTR_KNOWN(ZEND_STR_LINE), &tmp); } else { |