Skip to content

Commit f4b275b

Browse files
committed
Update zend_string.c
1 parent d4ef996 commit f4b275b

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

Zend/zend_string.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
#include "zend.h"
2020
#include "zend_globals.h"
21+
#include "zend_multiply.h"
2122

2223
#ifdef HAVE_VALGRIND
2324
# include "valgrind/callgrind.h"
@@ -474,7 +475,7 @@ ZEND_API zend_string *zend_string_concat2(
474475
const char *str1, size_t str1_len,
475476
const char *str2, size_t str2_len)
476477
{
477-
size_t len = str1_len + str2_len;
478+
size_t len = zend_safe_address_guarded(1, str1_len, str2_len);
478479
zend_string *res = zend_string_alloc(len, 0);
479480

480481
char *p = ZSTR_VAL(res);
@@ -490,7 +491,8 @@ ZEND_API zend_string *zend_string_concat3(
490491
const char *str2, size_t str2_len,
491492
const char *str3, size_t str3_len)
492493
{
493-
size_t len = str1_len + str2_len + str3_len;
494+
size_t tmp_len = zend_safe_address_guarded(1, str1_len, str2_len);
495+
size_t len = zend_safe_address_guarded(1, tmp_len, str3_len);
494496
zend_string *res = zend_string_alloc(len, 0);
495497

496498
char *p = ZSTR_VAL(res);

0 commit comments

Comments
 (0)