Skip to content

Minor improvements to DOM XPath #18355

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

Merged
merged 2 commits into from
Apr 19, 2025
Merged

Minor improvements to DOM XPath #18355

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4756019
DOM/XPath: Use ZSTR_LEN abstraction instead of direct member access
nielsdos Apr 19, 2025
531d0cc
DOM/XPath: Use RETURN_NEW_STR
nielsdos Apr 19, 2025
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
8 changes: 4 additions & 4 deletions ext/dom/xpath.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,14 +499,14 @@ PHP_METHOD(DOMXPath, quote) {
memcpy(ZSTR_VAL(output) + 1, input, input_len);
ZSTR_VAL(output)[input_len + 1] = '\'';
ZSTR_VAL(output)[input_len + 2] = '\0';
RETURN_STR(output);
RETURN_NEW_STR(output);
} else if (memchr(input, '"', input_len) == NULL) {
zend_string *const output = zend_string_safe_alloc(1, input_len, 2, false);
ZSTR_VAL(output)[0] = '"';
memcpy(ZSTR_VAL(output) + 1, input, input_len);
ZSTR_VAL(output)[input_len + 1] = '"';
ZSTR_VAL(output)[input_len + 2] = '\0';
RETURN_STR(output);
RETURN_NEW_STR(output);
} else {
smart_str output = {0};
// need to use the concat() trick published by Robert Rossney at https://stackoverflow.com/a/1352556/1067003
Expand All @@ -527,8 +527,8 @@ PHP_METHOD(DOMXPath, quote) {
smart_str_appendc(&output, ',');
}
ZEND_ASSERT(ptr == end);
ZSTR_VAL(output.s)[output.s->len - 1] = ')';
RETURN_STR(smart_str_extract(&output));
ZSTR_VAL(output.s)[ZSTR_LEN(output.s) - 1] = ')';
RETURN_NEW_STR(smart_str_extract(&output));
}
}
/* }}} */
Expand Down
Loading