archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use zend_get_executed_filename_ex

Browse source
This commit is contained in:
Xinchen Hui 2017-11-01 15:30:41 +08:00
parent a8a17a72b0
commit 2a37625c20
4 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Zend/zend_constants.c
View file

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

3
Zend/zend_exceptions.c
View file

@ -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 {

6
ext/standard/assert.c
View file

@ -219,11 +219,9 @@ PHP_FUNCTION(assert)
zval *args = safe_emalloc(!description ? 3 : 4, sizeof(zval), 0);
zval retval;
int i;
uint32_t lineno = zend_get_executed_lineno();
const char *filename = zend_get_executed_filename();
ZVAL_STRING(&args[0], SAFE_STRING(filename));
ZVAL_LONG (&args[1], lineno);
ZVAL_STR_COPY(&args[0], zend_get_executed_filename_ex());
ZVAL_LONG (&args[1], zend_get_executed_lineno());
ZVAL_STRING(&args[2], SAFE_STRING(myeval));
ZVAL_FALSE(&retval);

4
ext/standard/mail.c
View file

@ -521,10 +521,10 @@ PHPAPI int php_mail(char *to, char *subject, char *message, char *headers, char
}
if (PG(mail_x_header)) {
const char *tmp = zend_get_executed_filename();
zend_string *tmp = zend_get_executed_filename_ex();
zend_string *f;
f = php_basename(tmp, strlen(tmp), NULL, 0);
f = php_basename(ZSTR_VAL(tmp), ZSTR_LEN(tmp), NULL, 0);
if (headers != NULL && *headers) {
spprintf(&hdr, 0, "X-PHP-Originating-Script: " ZEND_LONG_FMT ":%s\n%s", php_getuid(), ZSTR_VAL(f), headers);