Make sure redisCluster members are all initialized on (re)creation

michael-grunder · michael-grunder · commit 162d8820bc6e · 2017-02-14T16:34:26.000-08:00
Fixes phpredis#1105
diff --git a/redis_cluster.c b/redis_cluster.c
@@ -282,23 +282,19 @@ create_cluster_context(zend_class_entry *class_type TSRMLS_DC) {
     redisCluster *cluster;
 
     // Allocate our actual struct
-    cluster = emalloc(sizeof(redisCluster));
-    memset(cluster, 0, sizeof(redisCluster));
+    cluster = ecalloc(1, sizeof(redisCluster));
 #else
 zend_object *
 create_cluster_context(zend_class_entry *class_type TSRMLS_DC) {
     redisCluster *cluster;
 
     // Allocate our actual struct
-    cluster = emalloc(sizeof(redisCluster) + sizeof(zval) * (class_type->default_properties_count - 1));
+    cluster = ecalloc(1, sizeof(redisCluster) + sizeof(zval) * (class_type->default_properties_count - 1));
 #endif
     
     // We're not currently subscribed anywhere
     cluster->subscribed_slot = -1;
 
-    // Assume we're up initially
-    cluster->clusterdown = 0;
-
     // Allocate our RedisSock we'll use to store prefix/serialization flags
     cluster->flags = ecalloc(1, sizeof(RedisSock));
 
