Use on-stack allocated valiables

yatsukhnenko · yatsukhnenko · commit 7a055cada8f4 · 2023-04-02T18:44:11.000+03:00
diff --git a/cluster_library.h b/cluster_library.h
@@ -12,9 +12,6 @@
 #define REDIS_CLUSTER_MOD   (REDIS_CLUSTER_SLOTS-1)
 
 /* Complete representation for various commands in RESP */
-#define RESP_MULTI_CMD         "*1\r\n$5\r\nMULTI\r\n"
-#define RESP_EXEC_CMD          "*1\r\n$4\r\nEXEC\r\n"
-#define RESP_DISCARD_CMD       "*1\r\n$7\r\nDISCARD\r\n"
 #define RESP_UNWATCH_CMD       "*1\r\n$7\r\nUNWATCH\r\n"
 #define RESP_CLUSTER_SLOTS_CMD "*2\r\n$7\r\nCLUSTER\r\n$5\r\nSLOTS\r\n"
 #define RESP_ASKING_CMD        "*1\r\n$6\r\nASKING\r\n"
diff --git a/common.h b/common.h
@@ -289,6 +289,11 @@ typedef enum {
     #endif
 #endif
 
+/* Complete representation for various commands in RESP */
+#define RESP_MULTI_CMD         "*1\r\n$5\r\nMULTI\r\n"
+#define RESP_EXEC_CMD          "*1\r\n$4\r\nEXEC\r\n"
+#define RESP_DISCARD_CMD       "*1\r\n$7\r\nDISCARD\r\n"
+
 /* {{{ struct RedisSock */
 typedef struct {
     php_stream          *stream;
diff --git a/library.c b/library.c
@@ -3052,9 +3052,9 @@ PHP_REDIS_API int redis_sock_connect(RedisSock *redis_sock)
 {
     struct timeval tv, read_tv, *tv_ptr = NULL;
     zend_string *persistent_id = NULL, *estr = NULL;
-    char host[1024], *pos, *address, *scheme = NULL;
+    char host[1024], scheme[8], *pos, *address;
     const char *fmtstr = "%s://%s:%d";
-    int host_len, usocket = 0, err = 0, tcp_flag = 1, scheme_free = 0;
+    int host_len, usocket = 0, err = 0, tcp_flag = 1;
     ConnectionPool *p = NULL;
 
     if (redis_sock->stream != NULL) {
@@ -3063,11 +3063,10 @@ PHP_REDIS_API int redis_sock_connect(RedisSock *redis_sock)
 
     address = ZSTR_VAL(redis_sock->host);
     if ((pos = strstr(address, "://")) == NULL) {
-        scheme = redis_sock->stream_ctx ? "ssl" : "tcp";
+        strcpy(scheme, redis_sock->stream_ctx ? "ssl" : "tcp");
     } else {
-        scheme = estrndup(address, pos - address);
+        snprintf(scheme, sizeof(scheme), "%.*s", (int)(pos - address), address);
         address = pos + sizeof("://") - 1;
-        scheme_free = 1;
     }
     if (address[0] == '/' && redis_sock->port < 1) {
         host_len = snprintf(host, sizeof(host), "unix://%s", address);
@@ -3085,7 +3084,6 @@ PHP_REDIS_API int redis_sock_connect(RedisSock *redis_sock)
 #endif
         host_len = snprintf(host, sizeof(host), fmtstr, scheme, address, redis_sock->port);
     }
-    if (scheme_free) efree(scheme);
 
     if (redis_sock->persistent) {
         if (INI_INT("redis.pconnect.pooling_enabled")) {
diff --git a/redis.c b/redis.c
@@ -160,15 +160,11 @@ zend_object_handlers redis_object_handlers;
 static int
 redis_send_discard(RedisSock *redis_sock)
 {
-    int result = FAILURE;
-    char *cmd, *resp;
-    int resp_len, cmd_len;
-
-    /* format our discard command */
-    cmd_len = REDIS_SPPRINTF(&cmd, "DISCARD", "");
+    char *resp;
+    int resp_len, result = FAILURE;
 
     /* send our DISCARD command */
-    if (redis_sock_write(redis_sock, cmd, cmd_len) >= 0 &&
+    if (redis_sock_write(redis_sock, ZEND_STRL(RESP_DISCARD_CMD)) >= 0 &&
        (resp = redis_sock_read(redis_sock,&resp_len)) != NULL)
     {
         /* success if we get OK */
@@ -178,9 +174,6 @@ redis_send_discard(RedisSock *redis_sock)
         efree(resp);
     }
 
-    /* free our command */
-    efree(cmd);
-
     /* return success/failure */
     return result;
 }
@@ -1865,8 +1858,8 @@ PHP_METHOD(Redis, multi)
 {
 
     RedisSock *redis_sock;
-    char *resp, *cmd;
-    int resp_len, cmd_len;
+    char *resp;
+    int resp_len;
     zval *object;
     zend_long multi_value = MULTI;
 
@@ -1897,15 +1890,12 @@ PHP_METHOD(Redis, multi)
     } else if (multi_value == MULTI) {
         /* Don't want to do anything if we're already in MULTI mode */
         if (!IS_MULTI(redis_sock)) {
-            cmd_len = REDIS_SPPRINTF(&cmd, "MULTI", "");
             if (IS_PIPELINE(redis_sock)) {
-                PIPELINE_ENQUEUE_COMMAND(cmd, cmd_len);
-                efree(cmd);
+                PIPELINE_ENQUEUE_COMMAND(RESP_MULTI_CMD, sizeof(RESP_MULTI_CMD) - 1);
                 REDIS_SAVE_CALLBACK(NULL, NULL);
                 REDIS_ENABLE_MODE(redis_sock, MULTI);
             } else {
-                SOCKET_WRITE_COMMAND(redis_sock, cmd, cmd_len)
-                efree(cmd);
+                SOCKET_WRITE_COMMAND(redis_sock, RESP_MULTI_CMD, sizeof(RESP_MULTI_CMD) - 1)
                 if ((resp = redis_sock_read(redis_sock, &resp_len)) == NULL) {
                     RETURN_FALSE;
                 } else if (strncmp(resp, "+OK", 3) != 0) {
@@ -1982,8 +1972,7 @@ redis_sock_read_multibulk_multi_reply(INTERNAL_FUNCTION_PARAMETERS,
 PHP_METHOD(Redis, exec)
 {
     RedisSock *redis_sock;
-    char *cmd;
-    int cmd_len, ret;
+    int ret;
     zval *object, z_ret;
 
     if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
@@ -1994,16 +1983,13 @@ PHP_METHOD(Redis, exec)
     }
 
     if (IS_MULTI(redis_sock)) {
-        cmd_len = REDIS_SPPRINTF(&cmd, "EXEC", "");
         if (IS_PIPELINE(redis_sock)) {
-            PIPELINE_ENQUEUE_COMMAND(cmd, cmd_len);
-            efree(cmd);
+            PIPELINE_ENQUEUE_COMMAND(RESP_EXEC_CMD, sizeof(RESP_EXEC_CMD) - 1);
             REDIS_SAVE_CALLBACK(NULL, NULL);
             REDIS_DISABLE_MODE(redis_sock, MULTI);
             RETURN_ZVAL(getThis(), 1, 0);
         }
-        SOCKET_WRITE_COMMAND(redis_sock, cmd, cmd_len)
-        efree(cmd);
+        SOCKET_WRITE_COMMAND(redis_sock, RESP_EXEC_CMD, sizeof(RESP_EXEC_CMD) - 1)
 
         ZVAL_NULL(&z_ret);
         ret = redis_sock_read_multibulk_multi_reply(
