Merge branch 'master' into preload

dstogov · dstogov · commit d9fc51bc3bdf · 2018-10-24T15:59:24.000+03:00
* master:
  Fixed reseting of interned strings buffer.
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -384,6 +384,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,
