summaryrefslogtreecommitdiff
path: root/Zend
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2020-10-30 12:39:47 +0100
committerNikita Popov <nikita.ppv@gmail.com>2020-10-30 12:39:47 +0100
commitb32a48f16b3907109155c7ecd88b7704dd6c5dc0 (patch)
treea4234e6187c3426480478273d5e70207d8882e3b /Zend
parentda4d5e9480729978eafbd9eba1867695f639eb34 (diff)
parent085e16c30176d21ca2ee7b3b0e158ea0f2a7cb28 (diff)
downloadphp-git-b32a48f16b3907109155c7ecd88b7704dd6c5dc0.tar.gz
Merge branch 'PHP-8.0'
* PHP-8.0: Fix signed integer overflow
Diffstat (limited to 'Zend')
-rw-r--r--Zend/zend_execute.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 1cec01591e..c58e1fa228 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -1553,7 +1553,7 @@ static zend_never_inline void zend_assign_to_string_offset(zval *str, zval *dim,
if ((size_t)offset >= Z_STRLEN_P(str)) {
/* Extend string if needed */
zend_long old_len = Z_STRLEN_P(str);
- ZVAL_NEW_STR(str, zend_string_extend(Z_STR_P(str), offset + 1, 0));
+ ZVAL_NEW_STR(str, zend_string_extend(Z_STR_P(str), (size_t)offset + 1, 0));
memset(Z_STRVAL_P(str) + old_len, ' ', offset - old_len);
Z_STRVAL_P(str)[offset+1] = 0;
} else if (!Z_REFCOUNTED_P(str)) {