Issue phpredis#1358

Use `cluster_free` in `free_cluster_context` to free cluster object.
Call `cluster_disconnect` before destroying cluster object.

Author: yatsukhnenko

cluster_library.c

@@ -831,9 +831,14 @@ PHP_REDIS_API redisCluster *cluster_create(double timeout, double read_timeout,
     return c;
 }
 
-PHP_REDIS_API void cluster_free(redisCluster *c) {
+PHP_REDIS_API void
+cluster_free(redisCluster *c, int free_ctx TSRMLS_DC)
+{
+    /* Disconnect from each node we're connected to */
+    cluster_disconnect(c TSRMLS_CC);
+
     /* Free any allocated prefix */
-    if (c->flags->prefix) efree(c->flags->prefix);
+    if (c->flags->prefix) zend_string_release(c->flags->prefix);
     efree(c->flags);
 
     /* Call hash table destructors */
@@ -848,7 +853,7 @@ PHP_REDIS_API void cluster_free(redisCluster *c) {
     if (c->err) zend_string_release(c->err);
 
     /* Free structure itself */
-    efree(c);
+    if (free_ctx) efree(c);
 }
 
 /* Takes our input hash table and returns a straigt C array with elements,
@@ -1069,7 +1074,7 @@ PHP_REDIS_API void cluster_disconnect(redisCluster *c TSRMLS_DC) {
     redisClusterNode *node;
 
     ZEND_HASH_FOREACH_PTR(c->nodes, node) {
-        if (node == NULL) break;
+        if (node == NULL) continue;
         redis_sock_disconnect(node->sock TSRMLS_CC);
         node->sock->lazy_connect = 1;
     } ZEND_HASH_FOREACH_END();

cluster_library.h

@@ -368,7 +368,7 @@ PHP_REDIS_API int cluster_send_slot(redisCluster *c, short slot, char *cmd,
 
 PHP_REDIS_API redisCluster *cluster_create(double timeout, double read_timeout,
     int failover, int persistent);
-PHP_REDIS_API void cluster_free(redisCluster *c);
+PHP_REDIS_API void cluster_free(redisCluster *c, int free_ctx TSRMLS_DC);
 PHP_REDIS_API int cluster_init_seeds(redisCluster *c, HashTable *ht_seeds);
 PHP_REDIS_API int cluster_map_keyspace(redisCluster *c TSRMLS_DC);
 PHP_REDIS_API void cluster_free_node(redisClusterNode *node);

redis_cluster.c

@@ -362,34 +362,26 @@ create_cluster_context(zend_class_entry *class_type TSRMLS_DC) {
 }
 
 /* Free redisCluster context */
-void
 #if (PHP_MAJOR_VERSION < 7)
-free_cluster_context(void *object TSRMLS_DC) {
+void
+free_cluster_context(void *object TSRMLS_DC)
+{
     redisCluster *cluster = (redisCluster*)object;
+
+    cluster_free(cluster, 0 TSRMLS_CC);
+    zend_object_std_dtor(&cluster->std TSRMLS_CC);
+    efree(cluster);
+}
 #else
-free_cluster_context(zend_object *object) {
+void
+free_cluster_context(zend_object *object)
+{
     redisCluster *cluster = (redisCluster*)((char*)(object) - XtOffsetOf(redisCluster, std));
-#endif
-    // Free any allocated prefix, as well as the struct
-    if (cluster->flags->prefix) efree(cluster->flags->prefix);
-    efree(cluster->flags);
-
-    // Free seeds HashTable itself
-    zend_hash_destroy(cluster->seeds);
-    efree(cluster->seeds);
-
-    // Destroy all Redis objects and free our nodes HashTable
-    zend_hash_destroy(cluster->nodes);
-    efree(cluster->nodes);
-
-    if (cluster->err) zend_string_release(cluster->err);
 
+    cluster_free(cluster, 0 TSRMLS_CC);
     zend_object_std_dtor(&cluster->std TSRMLS_CC);
-
-#if (PHP_MAJOR_VERSION < 7)
-    efree(cluster);
-#endif
 }
+#endif
 
 /* Attempt to connect to a Redis cluster provided seeds and timeout options */
 void redis_cluster_init(redisCluster *c, HashTable *ht_seeds, double timeout,

redis_session.c

@@ -947,7 +947,7 @@ PS_OPEN_FUNC(rediscluster) {
         PS_SET_MOD_DATA(c);
         retval = SUCCESS;
     } else {
-        cluster_free(c);
+        cluster_free(c, 1 TSRMLS_CC);
         retval = FAILURE;
     }
 
@@ -1108,7 +1108,7 @@ PS_CLOSE_FUNC(rediscluster)
 {
     redisCluster *c = PS_GET_MOD_DATA();
     if (c) {
-        cluster_free(c);
+        cluster_free(c, 1 TSRMLS_CC);
         PS_SET_MOD_DATA(NULL);
     }
     return SUCCESS;