Fix XINFO

michael-grunder · michael-grunder · commit e94e3060fab8 · 2018-06-17T16:59:25.000-07:00
diff --git a/redis_commands.c b/redis_commands.c
@@ -3729,7 +3729,7 @@ int redis_xinfo_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
 {
     char *op, *key, *arg;
     strlen_t oplen, keylen, arglen;
-    char *fmt = "sks";
+    char fmt[4];
     int argc = ZEND_NUM_ARGS();
 
     if (argc > 3 || zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ss",
@@ -3740,6 +3740,7 @@ int redis_xinfo_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
     }
 
     /* Our format is simply "s", "sk" or "sks" depending on argc */
+    memcpy(fmt, "sks", sizeof("sks")-1);
     fmt[argc] = '\0';
 
     *cmd_len = REDIS_CMD_SPPRINTF(cmd, "XINFO", fmt, op, oplen, key, keylen,

Original file line number	Diff line number	Diff line change
`@@ -3729,7 +3729,7 @@ int redis_xinfo_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,`
`3729`	`3729`	`{`
`3730`	`3730`	`char op, key, *arg;`
`3731`	`3731`	`strlen_t oplen, keylen, arglen;`
`3732`		`- char *fmt = "sks";`
	`3732`	`+ char fmt[4];`
`3733`	`3733`	`int argc = ZEND_NUM_ARGS();`
`3734`	`3734`
`3735`	`3735`	`if (argc > 3 \|\| zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s\|ss",`
`@@ -3740,6 +3740,7 @@ int redis_xinfo_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,`
`3740`	`3740`	`}`
`3741`	`3741`
`3742`	`3742`	`/* Our format is simply "s", "sk" or "sks" depending on argc */`
	`3743`	`+ memcpy(fmt, "sks", sizeof("sks")-1);`
`3743`	`3744`	`fmt[argc] = '\0';`
`3744`	`3745`
`3745`	`3746`	`*cmd_len = REDIS_CMD_SPPRINTF(cmd, "XINFO", fmt, op, oplen, key, keylen,`