Skip to content

Commit 10df94d

Browse files
committed
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Fix #80002: calc free space for new interned string is wrong
2 parents 81fffa8 + fcd26ff commit 10df94d

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ PHP NEWS
66
. Fixed bug #80007 (Potential type confusion in unixtojd() parameter parsing).
77
(Andy Postnikov)
88

9+
- OPcache:
10+
. Fixed bug #80002 (calc free space for new interned string is wrong).
11+
(t-matsuno)
12+
913
03 Sep 2020, PHP 7.4.10
1014

1115
- Core:

ext/opcache/ZendAccelerator.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ zend_string* ZEND_FASTCALL accel_new_interned_string(zend_string *str)
501501
} while (pos != STRTAB_INVALID_POS);
502502
}
503503

504-
if (UNEXPECTED(ZCSG(interned_strings).end - ZCSG(interned_strings).top < STRTAB_STR_SIZE(str))) {
504+
if (UNEXPECTED((char*)ZCSG(interned_strings).end - (char*)ZCSG(interned_strings).top < STRTAB_STR_SIZE(str))) {
505505
/* no memory, return the same non-interned string */
506506
zend_accel_error(ACCEL_LOG_WARNING, "Interned string buffer overflow");
507507
return str;

0 commit comments

Comments
 (0)