diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-11-01 15:30:41 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-11-01 15:40:54 +0800 |
| commit | 2a37625c20032d54af55a88d54d1a3a1ecc068d1 (patch) | |
| tree | 7bd825263e39a36beb718cc8f34df5ab7662f9cb /Zend | |
| parent | a8a17a72b06e6ea39a70eaf45ad2c3d6668e29ba (diff) | |
| download | php-git-2a37625c20032d54af55a88d54d1a3a1ecc068d1.tar.gz | |
Use zend_get_executed_filename_ex
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_constants.c | 8 | ||||
| -rw-r--r-- | Zend/zend_exceptions.c | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c index 100d0a263b..219e313813 100644 --- a/Zend/zend_constants.c +++ b/Zend/zend_constants.c @@ -210,15 +210,13 @@ static zend_constant *zend_get_special_constant(const char *name, size_t name_le return NULL; } else if (name_len == sizeof("__COMPILER_HALT_OFFSET__")-1 && !memcmp(name, "__COMPILER_HALT_OFFSET__", sizeof("__COMPILER_HALT_OFFSET__")-1)) { - const char *cfilename; + zend_string *cfilename; zend_string *haltname; - size_t clen; - cfilename = zend_get_executed_filename(); - clen = strlen(cfilename); + cfilename = zend_get_executed_filename_ex(); /* check for __COMPILER_HALT_OFFSET__ */ haltname = zend_mangle_property_name(haltoff, - sizeof("__COMPILER_HALT_OFFSET__") - 1, cfilename, clen, 0); + sizeof("__COMPILER_HALT_OFFSET__") - 1, ZSTR_VAL(cfilename), ZSTR_LEN(cfilename), 0); c = zend_hash_find_ptr(EG(zend_constants), haltname); zend_string_free(haltname); return c; diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index c892f701e3..20eb3c5200 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -222,9 +222,8 @@ 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_STRING(&tmp, zend_get_executed_filename()); + ZVAL_STR(&tmp, zend_get_executed_filename_ex()); 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 { |