Skip to content

Zend: reuse zend_get_unqualified_name() in zend_add_const_name_literal() #22598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jorgsowa wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −6
Open

Zend: reuse zend_get_unqualified_name() in zend_add_const_name_literal() #22598

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions Zend/zend_compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,12 +673,10 @@ static int zend_add_const_name_literal(zend_string *name, bool unqualified) /* {

int ret = zend_add_literal_string(&name);

size_t ns_len = 0, after_ns_len = ZSTR_LEN(name);
const char *after_ns = zend_memrchr(ZSTR_VAL(name), '\\', ZSTR_LEN(name));
if (after_ns) {
after_ns += 1;
ns_len = after_ns - ZSTR_VAL(name) - 1;
after_ns_len = ZSTR_LEN(name) - ns_len - 1;
const char *after_ns;
size_t after_ns_len;
if (zend_get_unqualified_name(name, &after_ns, &after_ns_len)) {
size_t ns_len = after_ns - ZSTR_VAL(name) - 1;

/* lowercased namespace name & original constant name */
tmp_name = zend_string_init(ZSTR_VAL(name), ZSTR_LEN(name), 0);
Expand All @@ -690,6 +688,7 @@ static int zend_add_const_name_literal(zend_string *name, bool unqualified) /* {
}
} else {
after_ns = ZSTR_VAL(name);
after_ns_len = ZSTR_LEN(name);
}

/* original unqualified constant name */
Expand Down
Loading