Fixed bug #70656 (require() statement broken after opcache_reset() or a few hours...

diff --git a/NEWS b/NEWS
index f4e6c8d6f5e1a2e9aaac90e1c6436f0a6fbe1841..d3f01376ce841286d5c56740b1db7730cdd7709c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,9 +2,13 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2015, PHP 7.0.1
 
+- Opcache:
+  . Fixed bug #70656 (require() statement broken after opcache_reset() or a
+    few hours of use). (Laruence)
+
 - Standard:
   . Fixed bug #70808 (array_merge_recursive corrupts memory of unset items).
-    (laruence)
+    (Laruence)
 
 - XSL:
   . Fixed bug #70678 (PHP7 returns true when false is expected). (Felipe)

diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
index eaadac6e3a948e6f6aaabe03bf9dcd436d31eabc..e23e7515b8fee63501aa20dbeb7e361b70dc2201 100644 (file)
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@ -249,6 +249,8 @@ static void accel_interned_strings_restore_state(void)
     uint nIndex;
     Bucket *p;
 
+       memset(ZCSG(interned_strings_saved_top),
+                       0, ZCSG(interned_strings_top) - ZCSG(interned_strings_saved_top));
        ZCSG(interned_strings_top) = ZCSG(interned_strings_saved_top);
     while (idx > 0) {
        idx--;