mirror of
https://github.com/php/php-src.git
synced 2024-09-21 18:07:23 +00:00
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Fix #80002: calc free space for new interned string is wrong
This commit is contained in:
commit
10df94dd0e
4
NEWS
4
NEWS
@ -6,6 +6,10 @@ PHP NEWS
|
||||
. Fixed bug #80007 (Potential type confusion in unixtojd() parameter parsing).
|
||||
(Andy Postnikov)
|
||||
|
||||
- OPcache:
|
||||
. Fixed bug #80002 (calc free space for new interned string is wrong).
|
||||
(t-matsuno)
|
||||
|
||||
03 Sep 2020, PHP 7.4.10
|
||||
|
||||
- Core:
|
||||
|
@ -501,7 +501,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;
|
||||
|
Loading…
Reference in New Issue
Block a user