php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

DOM/XPath: Use RETURN_NEW_STR

Browse Source 
These strings are newly allocated and can't be interned, so we can use
RETURN_NEW_STR.
This commit is contained in:
Niels Dossche
2025-04-19 16:01:34 +02:00
parent 35e96f621b
commit f39c07a3bb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ext/dom/xpath.c
View File

@@ -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
@@ -528,7 +528,7 @@ PHP_METHOD(DOMXPath, quote) {
}
ZEND_ASSERT(ptr == end);
ZSTR_VAL(output.s)[ZSTR_LEN(output.s) - 1] = ')';
RETURN_STR(smart_str_extract(&output));
RETURN_NEW_STR(smart_str_extract(&output));
}
}
/* }}} */