RANDOMKEY issue 26 fixed, generic test + regression added

[redis.git] / redis.c

diff --git a/redis.c b/redis.c
index 00df17e671eef96473653ee0273d9af357e197ae..d3e439c1546c62fad79d5caf001a7086e17ff7f2 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -2237,9 +2237,10 @@ static void randomkeyCommand(redisClient *c) {
    
     while(1) {
         de = dictGetRandomKey(c->db->dict);
-        if (expireIfNeeded(c->db,dictGetEntryKey(de)) == 0) break;
+        if (!de || expireIfNeeded(c->db,dictGetEntryKey(de)) == 0) break;
     }
     if (de == NULL) {
+        addReply(c,shared.plus);
         addReply(c,shared.crlf);
     } else {
         addReply(c,shared.plus);