8000 DOMXPath::quote(string $str): string by divinity76 · Pull Request #13456 · php/php-src · GitHub
[go: up one dir, main page]
Skip to content

DOMXPath::quote(string $str): string #13456

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 19 commits into from
Feb 22, 2024
Merged

DOMXPath::quote(string $str): string #13456

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
1730af1
DOMXPath::quote(string $str): string
divinity76 Feb 21, 2024
bedc0d0
oops
divinity76 Feb 21, 2024
779bfe1
efree
divinity76 Feb 21, 2024
9925f4a
eol
divinity76 Feb 21, 2024
74404a6
use smart_str api
divinity76 Feb 21, 2024
c17264e
cleanup
divinity76 Feb 21, 2024
b85a768
credits
divinity76 Feb 21, 2024
7ad4c91
cleanup
divinity76 Feb 21, 2024
e3fb678
micro optimize
divinity76 Feb 21, 2024
62a6eed
derp
divinity76 Feb 21, 2024
307a9be
Update ext/dom/tests/DOMXPath_quote.phpt
divinity76 Feb 21, 2024
641f01f
emptystring test
divinity76 Feb 21, 2024
1d935fd
Update ext/dom/xpath.c
divinity76 Feb 21, 2024
e9d4990
micro-optimize
divinity76 Feb 21, 2024
f90a244
Update ext/dom/xpath.c
divinity76 Feb 21, 2024
a20e67b
Update ext/dom/xpath.c
divinity76 Feb 21, 2024
ce9b737
better loop
divinity76 Feb 22, 2024
d930979
snakes on a plane
divinity76 Feb 22, 2024
7c478a1
safe_alloc + null terminated
divinity76 Feb 22, 2024
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
Prev Previous commit
safe_alloc + null terminated
  • Loading branch information
@divinity76
divinity76 committed Feb 22, 2024
commit 7c478a19bce51a474b10d7d75e0e1a02b6212e14
6 changes: 4 additions & 2 deletions ext/dom/xpath.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,16 +454,18 @@ PHP_METHOD(DOMXPath, quote) {
RETURN_THROWS();
}
if (memchr(input, '\'', input_len) == NULL) {
zend_string *const output = zend_string_alloc(input_len + 2, 0);
zend_string *const output = zend_string_safe_alloc(1, input_len, 2, false);
output->val[0] = '\'';
memcpy(output->val + 1, input, input_len);
output->val[input_len + 1] = '\'';
output->val[input_len + 2] = '\0';
RETURN_STR(output);
} else if (memchr(input, '"', input_len) == NULL) {
zend_string *const output = zend_string_alloc(input_len + 2, 0);
zend_string *const output = zend_string_safe_alloc(1, input_len, 2, false);
output->val[0] = '"';
memcpy(output->val + 1, input, input_len);
output->val[input_len + 1] = '"';
output->val[input_len + 2] = '\0';
RETURN_STR(output);
} else {
smart_str output = {0};
Expand Down
0