Skip to content

zend: avoid potential integer overflow in zend_string_concat2 and zend_string_concat3 #21626

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
LamentXU123 wants to merge 4 commits into
base: master
Choose a base branch
from
+4 −3
Open

zend: avoid potential integer overflow in zend_string_concat2 and zend_string_concat3 #21626

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f4b275b
Update zend_string.c
LamentXU123 Apr 3, 2026
4b34079
use zend_string_safe_alloc
LamentXU123 Apr 4, 2026
1827e0c
Update zend_string.c
LamentXU123 Apr 4, 2026
ab762f6
Update zend_string.c
LamentXU123 Apr 4, 2026
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
7 changes: 4 additions & 3 deletions Zend/zend_string.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

#include "zend.h"
#include "zend_globals.h"
#include "zend_multiply.h"

#ifdef HAVE_VALGRIND
# include "valgrind/callgrind.h"
Expand Down Expand Up @@ -474,8 +475,7 @@ ZEND_API zend_string *zend_string_concat2(
const char *str1, size_t str1_len,
const char *str2, size_t str2_len)
{
size_t len = str1_len + str2_len;
zend_string *res = zend_string_alloc(len, 0);
zend_string *res = zend_string_safe_alloc(1, str1_len, str2_len, 0);

char *p = ZSTR_VAL(res);
p = zend_mempcpy(p, str1, str1_len);
Expand All @@ -490,7 +490,8 @@ ZEND_API zend_string *zend_string_concat3(
const char *str2, size_t str2_len,
const char *str3, size_t str3_len)
{
size_t len = str1_len + str2_len + str3_len;
size_t tmp_len = zend_safe_address_guarded(1, str1_len, str2_len);
size_t len = zend_safe_address_guarded(1, tmp_len, str3_len);
zend_string *res = zend_string_alloc(len, 0);

char *p = ZSTR_VAL(res);
Expand Down
Loading