Fixed bug #67215 (php-cgi work with opcache, may be segmentation fault happen)

diff --git a/NEWS b/NEWS
index ca7ca7b4ffc537dbe8fa1917e28443f3128c3b6b..89bb30a82b6dac7336cb06d71e7637dc8cff1b71 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -18,7 +18,11 @@ PHP                                                                        NEWS
     (Adam)
 
 - FPM:
-  . Fix bug #67531 (syslog cannot be set in pool configuration). (Remi)
+  . Fixed bug #67531 (syslog cannot be set in pool configuration). (Remi)
+
+- OPCache:
+  . Fixed bug #67215 (php-cgi work with opcache, may be segmentation fault
+    happen) (Dmitry, Laruence)
 
 - pgsql:
   . Fix bug #67550 (Error in code "form" instead of "from", pgsql.c, line 756),

diff --git a/ext/opcache/zend_accelerator_util_funcs.c b/ext/opcache/zend_accelerator_util_funcs.c
index 14c6f7490f6c4cef28333700d8be2b13c58b81ab..dbab902b26f17fb11c5eb917f97f8924972e5447 100644 (file)
--- a/ext/opcache/zend_accelerator_util_funcs.c
+++ b/ext/opcache/zend_accelerator_util_funcs.c
@@ -837,16 +837,11 @@ static int zend_hash_unique_copy(HashTable *target, HashTable *source, unique_co
                                if (p->nKeyLength > 0 && p->arKey[0] == 0) {
                                        /* Mangled key */
 #if ZEND_EXTENSION_API_NO >= PHP_5_3_X_API_NO
-                                       if (((zend_function*)p->pData)->common.fn_flags & ZEND_ACC_CLOSURE) {
-                                               /* update closure */
-                                               if (zend_hash_quick_update(target, p->arKey, p->nKeyLength, p->h, p->pData, size, &t) == SUCCESS) {
-                                                       if (pCopyConstructor) {
-                                                               pCopyConstructor(t);
-                                                       }
+                                       if (zend_hash_quick_update(target, p->arKey, p->nKeyLength, p->h, p->pData, size, &t) == SUCCESS) {
+                                               if (pCopyConstructor) {
+                                                       pCopyConstructor(t);
                                                }
-                                       } else {
-                                               /* ignore and wait for runtime */
-                                       } 
+                                       }
 #endif
                                } else if (!ignore_dups && zend_hash_quick_find(target, p->arKey, p->nKeyLength, p->h, &t) == SUCCESS) {
                                        *fail_data = p->pData;