If no valid keys are found when processing an HMGET command,

michael-grunder · michael-grunder · commit 18339ec05b41 · 2013-09-03T21:13:57.000-07:00
free up our command and keys pointer and simply return FALSE. Addresses phpredis#379
diff --git a/redis.c b/redis.c
@@ -4993,6 +4993,13 @@ PHP_METHOD(Redis, hMget) {
             }
     }
 
+    // This is a failure if none of the keys were valid
+    if(i == 0) {
+        efree(cmd);
+        efree(z_keys);
+        RETURN_FALSE;
+    }
+
 	REDIS_PROCESS_REQUEST(redis_sock, cmd, cmd_len);
 	IF_ATOMIC() {
 		redis_sock_read_multibulk_reply_assoc(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, NULL, z_keys);

Original file line number	Diff line number	Diff line change
`@@ -4993,6 +4993,13 @@ PHP_METHOD(Redis, hMget) {`
`4993`	`4993`	`}`
`4994`	`4994`	`}`
`4995`	`4995`
	`4996`	`+ // This is a failure if none of the keys were valid`
	`4997`	`+ if(i == 0) {`
	`4998`	`+ efree(cmd);`
	`4999`	`+ efree(z_keys);`
	`5000`	`+ RETURN_FALSE;`
	`5001`	`+ }`
	`5002`	`+`
`4996`	`5003`	`REDIS_PROCESS_REQUEST(redis_sock, cmd, cmd_len);`
`4997`	`5004`	`IF_ATOMIC() {`
`4998`	`5005`	`redis_sock_read_multibulk_reply_assoc(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, NULL, z_keys);`