Fix a couple of memory leaks in Redis/RedisCluster

michael-grunder · michael-grunder · commit a107c9fc08e0 · 2020-01-19T09:35:24.000-08:00
Addresses #1701
diff --git a/cluster_library.c b/cluster_library.c
@@ -2448,6 +2448,8 @@ PHP_REDIS_API void cluster_mbulk_mget_resp(INTERNAL_FUNCTION_PARAMETERS,
         } else {
             add_next_index_zval(&c->multi_resp, mctx->z_multi);
         }
+
+        efree(mctx->z_multi);
     }
 
     // Clean up this context item
diff --git a/redis_commands.c b/redis_commands.c
@@ -4083,13 +4083,14 @@ void redis_unserialize_handler(INTERNAL_FUNCTION_PARAMETERS,
         // Just return the value that was passed to us
         RETURN_STRINGL(value, value_len);
     }
-    zval zv, *z_ret = &zv;
-    if (!redis_unserialize(redis_sock, value, value_len, z_ret)) {
+
+    zval z_ret;
+    if (!redis_unserialize(redis_sock, value, value_len, &z_ret)) {
         // Badly formed input, throw an exception
         zend_throw_exception(ex, "Invalid serialized data, or unserialization error", 0);
         RETURN_FALSE;
     }
-    RETURN_ZVAL(z_ret, 1, 0);
+    RETURN_ZVAL(&z_ret, 0, 0);
 }
 
 /* vim: set tabstop=4 softtabstop=4 expandtab shiftwidth=4: */

Original file line number	Diff line number	Diff line change
`@@ -2448,6 +2448,8 @@ PHP_REDIS_API void cluster_mbulk_mget_resp(INTERNAL_FUNCTION_PARAMETERS,`
`2448`	`2448`	`} else {`
`2449`	`2449`	`add_next_index_zval(&c->multi_resp, mctx->z_multi);`
`2450`	`2450`	`}`
	`2451`	`+`
	`2452`	`+ efree(mctx->z_multi);`
`2451`	`2453`	`}`
`2452`	`2454`
`2453`	`2455`	`// Clean up this context item`
Original file line number	Diff line number	Diff line change
`@@ -4083,13 +4083,14 @@ void redis_unserialize_handler(INTERNAL_FUNCTION_PARAMETERS,`
`4083`	`4083`	`// Just return the value that was passed to us`
`4084`	`4084`	`RETURN_STRINGL(value, value_len);`
`4085`	`4085`	`}`
`4086`		`- zval zv, *z_ret = &zv;`
`4087`		`- if (!redis_unserialize(redis_sock, value, value_len, z_ret)) {`
	`4086`	`+`
	`4087`	`+ zval z_ret;`
	`4088`	`+ if (!redis_unserialize(redis_sock, value, value_len, &z_ret)) {`
`4088`	`4089`	`// Badly formed input, throw an exception`
`4089`	`4090`	`zend_throw_exception(ex, "Invalid serialized data, or unserialization error", 0);`
`4090`	`4091`	`RETURN_FALSE;`
`4091`	`4092`	`}`
`4092`		`- RETURN_ZVAL(z_ret, 1, 0);`
	`4093`	`+ RETURN_ZVAL(&z_ret, 0, 0);`
`4093`	`4094`	`}`
`4094`	`4095`
`4095`	`4096`	`/* vim: set tabstop=4 softtabstop=4 expandtab shiftwidth=4: */`