From 2a37625c20032d54af55a88d54d1a3a1ecc068d1 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Wed, 1 Nov 2017 15:30:41 +0800 Subject: Use zend_get_executed_filename_ex --- Zend/zend_constants.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'Zend/zend_constants.c') 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; -- cgit v1.2.1