Use zend_string for pipeline_cmd

yatsukhnenko · yatsukhnenko · commit e98f51165bba · 2019-01-09T10:43:19.000+02:00
diff --git a/common.h b/common.h
@@ -34,7 +34,7 @@ zend_string_alloc(size_t len, int persistent)
     zend_string *zstr = emalloc(sizeof(*zstr) + len + 1);
 
     ZSTR_VAL(zstr) = (char *)zstr + sizeof(*zstr);
-    zstr->len = len;
+    ZSTR_LEN(zstr) = len;
     zstr->gc = 0x01;
     return zstr;
 }
@@ -49,6 +49,25 @@ zend_string_init(const char *str, size_t len, int persistent)
     return zstr;
 }
 
+static zend_always_inline zend_string *
+zend_string_realloc(zend_string *s, size_t len, int persistent)
+{
+    zend_string *zstr;
+
+    if (!s->gc) {
+        zstr = zend_string_init(ZSTR_VAL(s), len, 0);
+    } else if (s->gc & 0x10) {
+        ZSTR_VAL(s) = erealloc(ZSTR_VAL(s), len + 1);
+        ZSTR_LEN(s) = len;
+        zstr = s;
+    } else {
+        zstr = erealloc(s, sizeof(*zstr) + len + 1);
+        ZSTR_VAL(zstr) = (char *)zstr + sizeof(*zstr);
+        ZSTR_LEN(zstr) = len;
+    }
+    return zstr;
+}
+
 #define zend_string_equal_val(s1, s2) !memcmp(ZSTR_VAL(s1), ZSTR_VAL(s2), ZSTR_LEN(s1))
 #define zend_string_equal_content(s1, s2) (ZSTR_LEN(s1) == ZSTR_LEN(s2) && zend_string_equal_val(s1, s2))
 #define zend_string_equals(s1, s2) (s1 == s2 || zend_string_equal_content(s1, s2))
@@ -533,14 +552,12 @@ typedef enum _PUBSUB_TYPE {
 
 #define PIPELINE_ENQUEUE_COMMAND(cmd, cmd_len) do { \
     if (redis_sock->pipeline_cmd == NULL) { \
-        redis_sock->pipeline_cmd = estrndup(cmd, cmd_len); \
+        redis_sock->pipeline_cmd = zend_string_init(cmd, cmd_len, 0); \
     } else { \
-        redis_sock->pipeline_cmd = erealloc(redis_sock->pipeline_cmd, \
-            redis_sock->pipeline_len + cmd_len); \
-        memcpy(&redis_sock->pipeline_cmd[redis_sock->pipeline_len], \
-            cmd, cmd_len); \
+        size_t pipeline_len = ZSTR_LEN(redis_sock->pipeline_cmd); \
+        redis_sock->pipeline_cmd = zend_string_realloc(redis_sock->pipeline_cmd, pipeline_len + cmd_len, 0); \
+        memcpy(&ZSTR_VAL(redis_sock->pipeline_cmd)[pipeline_len], cmd, cmd_len); \
     } \
-    redis_sock->pipeline_len += cmd_len; \
 } while (0)
 
 #define SOCKET_WRITE_COMMAND(redis_sock, cmd, cmd_len) \
@@ -675,8 +692,7 @@ typedef struct {
     fold_item      *head;
     fold_item      *current;
 
-    char           *pipeline_cmd;
-    size_t         pipeline_len;
+    zend_string    *pipeline_cmd;
 
     zend_string    *err;
 
diff --git a/library.c b/library.c
@@ -1724,7 +1724,6 @@ redis_sock_create(char *host, int host_len, unsigned short port,
     redis_sock->current = NULL;
 
     redis_sock->pipeline_cmd = NULL;
-    redis_sock->pipeline_len = 0;
 
     redis_sock->err = NULL;
 
@@ -2104,7 +2103,7 @@ PHP_REDIS_API void redis_free_socket(RedisSock *redis_sock)
         zend_string_release(redis_sock->prefix);
     }
     if (redis_sock->pipeline_cmd) {
-        efree(redis_sock->pipeline_cmd);
+        zend_string_release(redis_sock->pipeline_cmd);
     }
     if (redis_sock->err) {
         zend_string_release(redis_sock->err);
diff --git a/redis.c b/redis.c
@@ -2387,17 +2387,16 @@ PHP_METHOD(Redis, exec)
             /* Empty array when no command was run. */
             array_init(return_value);
         } else {
-            if (redis_sock_write(redis_sock, redis_sock->pipeline_cmd,
-                    redis_sock->pipeline_len TSRMLS_CC) < 0) {
+            if (redis_sock_write(redis_sock, ZSTR_VAL(redis_sock->pipeline_cmd),
+                    ZSTR_LEN(redis_sock->pipeline_cmd) TSRMLS_CC) < 0) {
                 ZVAL_FALSE(return_value);
             } else {
                 array_init(return_value);
                 redis_sock_read_multibulk_multi_reply_loop(
                     INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, return_value, 0);
             }
-            efree(redis_sock->pipeline_cmd);
+            zend_string_release(redis_sock->pipeline_cmd);
             redis_sock->pipeline_cmd = NULL;
-            redis_sock->pipeline_len = 0;
         }
         free_reply_callbacks(redis_sock);
         REDIS_DISABLE_MODE(redis_sock, PIPELINE);

Original file line number	Diff line number	Diff line change
`@@ -1724,7 +1724,6 @@ redis_sock_create(char *host, int host_len, unsigned short port,`
`1724`	`1724`	`redis_sock->current = NULL;`
`1725`	`1725`
`1726`	`1726`	`redis_sock->pipeline_cmd = NULL;`
`1727`		`- redis_sock->pipeline_len = 0;`
`1728`	`1727`
`1729`	`1728`	`redis_sock->err = NULL;`
`1730`	`1729`
`@@ -2104,7 +2103,7 @@ PHP_REDIS_API void redis_free_socket(RedisSock *redis_sock)`
`2104`	`2103`	`zend_string_release(redis_sock->prefix);`
`2105`	`2104`	`}`
`2106`	`2105`	`if (redis_sock->pipeline_cmd) {`
`2107`		`- efree(redis_sock->pipeline_cmd);`
	`2106`	`+ zend_string_release(redis_sock->pipeline_cmd);`
`2108`	`2107`	`}`
`2109`	`2108`	`if (redis_sock->err) {`
`2110`	`2109`	`zend_string_release(redis_sock->err);`