From 31fe053a62eab0133b18537764cf2246709414f1 Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Thu, 20 Sep 2012 16:33:36 +0200
Subject: [PATCH] SRANDMEMBER <count> leak fixed.

For "CASE 4" (see code) we need to free the element if it's already in
the result dictionary and adding it failed.
---
 src/t_set.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/t_set.c b/src/t_set.c
index 3ad75aef..08110b83 100644
--- a/src/t_set.c
+++ b/src/t_set.c
@@ -476,19 +476,21 @@ void srandmemberWithCountCommand(redisClient *c) {
         unsigned long added = 0;
 
         while(added < count) {
-            int retval;
-
             encoding = setTypeRandomElement(set,&ele,&llele);
             if (encoding == REDIS_ENCODING_INTSET) {
-                retval = dictAdd(d,createStringObjectFromLongLong(llele),NULL);
+                ele = createStringObjectFromLongLong(llele);
             } else if (ele->encoding == REDIS_ENCODING_RAW) {
-                retval = dictAdd(d,dupStringObject(ele),NULL);
+                ele = dupStringObject(ele);
             } else if (ele->encoding == REDIS_ENCODING_INT) {
-                retval = dictAdd(d,
-                    createStringObjectFromLongLong((long)ele->ptr),NULL);
+                ele = createStringObjectFromLongLong((long)ele->ptr);
             }
-
-            if (retval == DICT_OK) added++;
+            /* Try to add the object to the dictionary. If it already exists
+             * free it, otherwise increment the number of objects we have
+             * in the result dictionary. */
+            if (dictAdd(d,ele,NULL) == DICT_OK)
+                added++;
+            else
+                decrRefCount(ele);
         }
     }
 
-- 
GitLab