Merge branch 'PHP-7.4' into PHP-8.0

nikic · nikic · commit e250ce64e687 · 2021-09-16T16:29:51.000+02:00
* PHP-7.4:
  Fix persistent smart_str allocation
diff --git a/Zend/zend_smart_str.c b/Zend/zend_smart_str.c
@@ -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)
 {
 	if (UNEXPECTED(!str->s)) {
-		str->a = len <= SMART_STR_START_SIZE
+		str->a = len <= SMART_STR_START_LEN
 				? SMART_STR_START_LEN
 				: SMART_STR_NEW_LEN(len);
 		str->s = zend_string_alloc(str->a, 1);

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ ZEND_API void ZEND_FASTCALL smart_str_erealloc(smart_str *str, size_t len)`
`43`	`43`	`ZEND_API void ZEND_FASTCALL smart_str_realloc(smart_str *str, size_t len)`
`44`	`44`	`{`
`45`	`45`	`if (UNEXPECTED(!str->s)) {`
`46`		`- str->a = len <= SMART_STR_START_SIZE`
	`46`	`+ str->a = len <= SMART_STR_START_LEN`
`47`	`47`	`? SMART_STR_START_LEN`
`48`	`48`	`: SMART_STR_NEW_LEN(len);`
`49`	`49`	`str->s = zend_string_alloc(str->a, 1);`