Merge branch 'PHP-7.3'

* PHP-7.3:
  Fixed reseting of interned strings buffer.
This commit is contained in:
Dmitry Stogov 2018-10-24 15:46:22 +03:00
commit b6ef8998d5

View File

@ -380,6 +380,9 @@ static void accel_interned_strings_restore_state(void)
memset(ZCSG(interned_strings).saved_top,
0, (char*)ZCSG(interned_strings).top - (char*)ZCSG(interned_strings).saved_top);
/* Reset "top" */
ZCSG(interned_strings).top = ZCSG(interned_strings).saved_top;
/* rehash */
memset((char*)&ZCSG(interned_strings) + sizeof(zend_string_table),
STRTAB_INVALID_POS,