Merge branch 'PHP-7.4' into master

cmb69 · cmb69 · commit 08d2e511e440 · 2020-08-24T11:04:27.000+02:00
* PHP-7.4:
  Fix #80002: calc free space for new interned string is wrong
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -493,7 +493,7 @@ zend_string* ZEND_FASTCALL accel_new_interned_string(zend_string *str)
 		} while (pos != STRTAB_INVALID_POS);
 	}
 
-	if (UNEXPECTED(ZCSG(interned_strings).end - ZCSG(interned_strings).top < STRTAB_STR_SIZE(str))) {
+	if (UNEXPECTED((char*)ZCSG(interned_strings).end - (char*)ZCSG(interned_strings).top < STRTAB_STR_SIZE(str))) {
 	    /* no memory, return the same non-interned string */
 		zend_accel_error(ACCEL_LOG_WARNING, "Interned string buffer overflow");
 		return str;

Original file line number	Diff line number	Diff line change
`@@ -493,7 +493,7 @@ zend_string* ZEND_FASTCALL accel_new_interned_string(zend_string *str)`
`493`	`493`	`} while (pos != STRTAB_INVALID_POS);`
`494`	`494`	`}`
`495`	`495`
`496`		`- if (UNEXPECTED(ZCSG(interned_strings).end - ZCSG(interned_strings).top < STRTAB_STR_SIZE(str))) {`
	`496`	`+ if (UNEXPECTED((char)ZCSG(interned_strings).end - (char)ZCSG(interned_strings).top < STRTAB_STR_SIZE(str))) {`
`497`	`497`	`/* no memory, return the same non-interned string */`
`498`	`498`	`zend_accel_error(ACCEL_LOG_WARNING, "Interned string buffer overflow");`
`499`	`499`	`return str;`