Masters info leakfix (#1462)

michael-grunder · web-flow · commit 91bd7426d539 · 2018-11-22T11:37:18.000-08:00
Fix for memory leaks in `RedisCluster-&gt;_masters()` and `RedisCluster-&gt;info()`
diff --git a/cluster_library.c b/cluster_library.c
@@ -2072,12 +2072,13 @@ PHP_REDIS_API void cluster_info_resp(INTERNAL_FUNCTION_PARAMETERS, redisCluster
     }
 
     /* Parse response, free memory */
+    REDIS_MAKE_STD_ZVAL(z_result);
     redis_parse_info_response(info, z_result);
     efree(info);
 
     // Return our array
     if (CLUSTER_IS_ATOMIC(c)) {
-        RETVAL_ZVAL(z_result, 1, 0);
+        RETVAL_ZVAL(z_result, 0, 1);
     } else {
         add_next_index_zval(&c->multi_resp, z_result);
     }
diff --git a/library.c b/library.c
@@ -840,6 +840,7 @@ PHP_REDIS_API void redis_info_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *
     }
 
     /* Parse it into a zval array */
+    REDIS_MAKE_STD_ZVAL(z_ret);
     redis_parse_info_response(response, z_ret);
 
     /* Free source response */
diff --git a/redis_cluster.c b/redis_cluster.c
@@ -2026,25 +2026,21 @@ PHP_METHOD(RedisCluster, _unserialize) {
 PHP_METHOD(RedisCluster, _masters) {
     redisCluster *c = GET_CONTEXT();
     redisClusterNode *node;
-    zval zv, *z_ret = &zv;
 
-    array_init(z_ret);
+    array_init(return_value);
 
     ZEND_HASH_FOREACH_PTR(c->nodes, node) {
         if (node == NULL) break;
 
         zval z, *z_sub = &z;
-#if (PHP_MAJOR_VERSION < 7)
-        MAKE_STD_ZVAL(z_sub);
-#endif
+
+        REDIS_MAKE_STD_ZVAL(z_sub);
         array_init(z_sub);
 
         add_next_index_stringl(z_sub, ZSTR_VAL(node->sock->host), ZSTR_LEN(node->sock->host));
         add_next_index_long(z_sub, node->sock->port);
-        add_next_index_zval(z_ret, z_sub);
+        add_next_index_zval(return_value, z_sub);
     } ZEND_HASH_FOREACH_END();
-
-    RETVAL_ZVAL(z_ret, 1, 0);
 }
 
 PHP_METHOD(RedisCluster, _redir) {
@@ -2714,6 +2710,7 @@ PHP_METHOD(RedisCluster, info) {
     int cmd_len;
     strlen_t opt_len = 0;
     void *ctx = NULL;
+
     zval *z_arg;
     short slot;
 
diff --git a/tests/RedisTest.php b/tests/RedisTest.php
@@ -1882,36 +1882,45 @@ public function testWait() {
     }
 
     public function testInfo() {
-        $info = $this->redis->info();
+        foreach (Array(false, true) as $boo_multi) {
+            if ($boo_multi) {
+                $this->redis->multi();
+                $this->redis->info();
+                $info = $this->redis->exec();
+                $info = $info[0];
+            } else {
+                $info = $this->redis->info();
+            }
 
-        $keys = array(
-            "redis_version",
-            "arch_bits",
-            "uptime_in_seconds",
-            "uptime_in_days",
-            "connected_clients",
-            "connected_slaves",
-            "used_memory",
-            "total_connections_received",
-            "total_commands_processed",
-            "role"
-        );
-        if (version_compare($this->version, "2.5.0", "lt")) {
-            array_push($keys,
-                "changes_since_last_save",
-                "bgsave_in_progress",
-                "last_save_time"
+            $keys = array(
+                "redis_version",
+                "arch_bits",
+                "uptime_in_seconds",
+                "uptime_in_days",
+                "connected_clients",
+                "connected_slaves",
+                "used_memory",
+                "total_connections_received",
+                "total_commands_processed",
+                "role"
             );
-        } else {
-            array_push($keys,
-                "rdb_changes_since_last_save",
-                "rdb_bgsave_in_progress",
-                "rdb_last_save_time"
-            );
-        }
+            if (version_compare($this->version, "2.5.0", "lt")) {
+                array_push($keys,
+                    "changes_since_last_save",
+                    "bgsave_in_progress",
+                    "last_save_time"
+                );
+            } else {
+                array_push($keys,
+                    "rdb_changes_since_last_save",
+                    "rdb_bgsave_in_progress",
+                    "rdb_last_save_time"
+                );
+            }
 
-        foreach($keys as $k) {
-            $this->assertTrue(in_array($k, array_keys($info)));
+            foreach($keys as $k) {
+                $this->assertTrue(in_array($k, array_keys($info)));
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -2072,12 +2072,13 @@ PHP_REDIS_API void cluster_info_resp(INTERNAL_FUNCTION_PARAMETERS, redisCluster`
`2072`	`2072`	`}`
`2073`	`2073`
`2074`	`2074`	`/* Parse response, free memory */`
	`2075`	`+ REDIS_MAKE_STD_ZVAL(z_result);`
`2075`	`2076`	`redis_parse_info_response(info, z_result);`
`2076`	`2077`	`efree(info);`
`2077`	`2078`
`2078`	`2079`	`// Return our array`
`2079`	`2080`	`if (CLUSTER_IS_ATOMIC(c)) {`
`2080`		`- RETVAL_ZVAL(z_result, 1, 0);`
	`2081`	`+ RETVAL_ZVAL(z_result, 0, 1);`
`2081`	`2082`	`} else {`
`2082`	`2083`	`add_next_index_zval(&c->multi_resp, z_result);`
`2083`	`2084`	`}`
Original file line number	Diff line number	Diff line change
`@@ -840,6 +840,7 @@ PHP_REDIS_API void redis_info_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *`
`840`	`840`	`}`
`841`	`841`
`842`	`842`	`/* Parse it into a zval array */`
	`843`	`+ REDIS_MAKE_STD_ZVAL(z_ret);`
`843`	`844`	`redis_parse_info_response(response, z_ret);`
`844`	`845`
`845`	`846`	`/* Free source response */`