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.

diff --git a/src/t_set.c b/src/t_set.c
index 3ad75aef640b02c6dc904cb3d69b8c6cef7d468a..08110b83cb69db965d7bb80cc0d67970d0ab8478 100644 (file)
--- 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) {
         unsigned long added = 0;
 
         while(added < count) {

-            int retval;
-

             encoding = setTypeRandomElement(set,&ele,&llele);
             if (encoding == REDIS_ENCODING_INTSET) {
             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) {
             } else if (ele->encoding == REDIS_ENCODING_RAW) {

-                retval = dictAdd(d,dupStringObject(ele),NULL);
+                ele = dupStringObject(ele);

             } else if (ele->encoding == REDIS_ENCODING_INT) {
             } 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);

         }
     }
 
         }
     }