Skip to content

Commit d9fc51b

Browse files
committed
Merge branch 'master' into preload
* master: Fixed reseting of interned strings buffer.
2 parents b5ffba0 + b6ef899 commit d9fc51b

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

ext/opcache/ZendAccelerator.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,9 @@ static void accel_interned_strings_restore_state(void)
384384
memset(ZCSG(interned_strings).saved_top,
385385
0, (char*)ZCSG(interned_strings).top - (char*)ZCSG(interned_strings).saved_top);
386386

387+
/* Reset "top" */
388+
ZCSG(interned_strings).top = ZCSG(interned_strings).saved_top;
389+
387390
/* rehash */
388391
memset((char*)&ZCSG(interned_strings) + sizeof(zend_string_table),
389392
STRTAB_INVALID_POS,

0 commit comments

Comments
 (0)