Merge branch 'hotfix/hmget_no_valid_keys'

2 files changed, 9 insertions, 0 deletions

diff --git a/redis.c b/redis.c
index 38a01142..40c665c7 100644
--- 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);
diff --git a/tests/TestRedis.php b/tests/TestRedis.php
index d19f9e0b..27ff047d 100644
--- a/tests/TestRedis.php
+++ b/tests/TestRedis.php
@@ -2282,6 +2282,8 @@ class Redis_Test extends TestSuite
 	$this->assertFalse(array(123 => 'x') === $this->redis->hMget('h', array(123)));
 	$this->assertTrue(array(123 => FALSE) === $this->redis->hMget('h', array(123)));
 
+    // Test with an array populated with things we can't use as keys
+    $this->assertTrue($this->redis->hmget('h', Array(false,NULL,false)) === FALSE);
 
 	// hmget/hmset with numeric fields
 	$this->redis->del('h');