archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.4' into PHP-8.0

Browse source 
* PHP-7.4:
  Fix persistent smart_str allocation
This commit is contained in:
Nikita Popov 2021-09-16 16:29:51 +02:00
commit e250ce64e6
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Zend/zend_smart_str.c
View file

@ -43,7 +43,7 @@ ZEND_API void ZEND_FASTCALL smart_str_erealloc(smart_str *str, size_t len)
ZEND_API void ZEND_FASTCALL smart_str_realloc(smart_str *str, size_t len) ZEND_API void ZEND_FASTCALL smart_str_realloc(smart_str *str, size_t len)
{ {
if (UNEXPECTED(!str->s)) { if (UNEXPECTED(!str->s)) {
str->a = len <= SMART_STR_START_SIZE str->a = len <= SMART_STR_START_LEN
? SMART_STR_START_LEN ? SMART_STR_START_LEN
: SMART_STR_NEW_LEN(len); : SMART_STR_NEW_LEN(len);
str->s = zend_string_alloc(str->a, 1); str->s = zend_string_alloc(str->a, 1);