Fix memory leak and segfault in Redis::exec

yatsukhnenko · yatsukhnenko · commit 362e1141a364 · 2023-09-23T14:11:45.000+03:00
diff --git a/redis.c b/redis.c
@@ -1982,6 +1982,8 @@ PHP_METHOD(Redis, exec)
         RETURN_FALSE;
     }
 
+    ZVAL_FALSE(&z_ret);
+
     if (IS_MULTI(redis_sock)) {
         if (IS_PIPELINE(redis_sock)) {
             PIPELINE_ENQUEUE_COMMAND(RESP_EXEC_CMD, sizeof(RESP_EXEC_CMD) - 1);
@@ -1991,7 +1993,6 @@ PHP_METHOD(Redis, exec)
         }
         SOCKET_WRITE_COMMAND(redis_sock, RESP_EXEC_CMD, sizeof(RESP_EXEC_CMD) - 1)
 
-        ZVAL_NULL(&z_ret);
         ret = redis_sock_read_multibulk_multi_reply(
             INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, &z_ret);
         free_reply_callbacks(redis_sock);
@@ -2025,7 +2026,7 @@ PHP_METHOD(Redis, exec)
         free_reply_callbacks(redis_sock);
         REDIS_DISABLE_MODE(redis_sock, PIPELINE);
     }
-    RETURN_ZVAL(&z_ret, 1, 0);
+    RETURN_ZVAL(&z_ret, 0, 1);
 }
 
 PHP_REDIS_API int

Original file line number	Diff line number	Diff line change
`@@ -1982,6 +1982,8 @@ PHP_METHOD(Redis, exec)`
`1982`	`1982`	`RETURN_FALSE;`
`1983`	`1983`	`}`
`1984`	`1984`
	`1 B2D1 985`	`+ ZVAL_FALSE(&z_ret);`
	`1986`	`+`
`1985`	`1987`	`if (IS_MULTI(redis_sock)) {`
`1986`	`1988`	`if (IS_PIPELINE(redis_sock)) {`
`1987`	`1989`	`PIPELINE_ENQUEUE_COMMAND(RESP_EXEC_CMD, sizeof(RESP_EXEC_CMD) - 1);`
`@@ -1991,7 +1993,6 @@ PHP_METHOD(Redis, exec)`
`1991`	`1993`	`}`
`1992`	`1994`	`SOCKET_WRITE_COMMAND(redis_sock, RESP_EXEC_CMD, sizeof(RESP_EXEC_CMD) - 1)`
`1993`	`1995`
`1994`		`- ZVAL_NULL(&z_ret);`
`1995`	`1996`	`ret = redis_sock_read_multibulk_multi_reply(`
`1996`	`1997`	`INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, &z_ret);`
`1997`	`1998`	`free_reply_callbacks(redis_sock);`
`@@ -2025,7 +2026,7 @@ PHP_METHOD(Redis, exec)`
`2025`	`2026`	`free_reply_callbacks(redis_sock);`
`2026`	`2027`	`REDIS_DISABLE_MODE(redis_sock, PIPELINE);`
`2027`	`2028`	`}`
`2028`		`- RETURN_ZVAL(&z_ret, 1, 0);`
	`2029`	`+ RETURN_ZVAL(&z_ret, 0, 1);`
`2029`	`2030`	`}`
`2030`	`2031`
`2031`	`2032`	`PHP_REDIS_API int`