Skip to content

Commit 82897fc

Browse files
authored
Minor cleanup in dom_node_concatenated_name_helper() (#13639)
1 parent f9ddd2b commit 82897fc

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

ext/dom/node.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,8 @@
3232

3333
zend_string *dom_node_concatenated_name_helper(size_t name_len, const char *name, size_t prefix_len, const char *prefix)
3434
{
35-
if (UNEXPECTED(prefix_len > ZSTR_MAX_LEN / 2 - 1 || name_len > ZSTR_MAX_LEN / 2 - 1)) {
36-
return zend_empty_string;
37-
}
38-
zend_string *str = zend_string_alloc(prefix_len + 1 + name_len, false);
35+
/* prefix_len can't overflow because it would need to occupy the entire address space */
36+
zend_string *str = zend_string_safe_alloc(1, name_len, prefix_len + 1, false);
3937
memcpy(ZSTR_VAL(str), prefix, prefix_len);
4038
ZSTR_VAL(str)[prefix_len] = ':';
4139
memcpy(ZSTR_VAL(str) + prefix_len + 1, name, name_len + 1 /* include \0 */);

0 commit comments

Comments
 (0)