BITCOUNT: fix segmentation fault.

[redis.git] / src / t_set.c

diff --git a/src/t_set.c b/src/t_set.c
index bffea3d4d6d256dcf25b7c794b10a651389a5606..df8ade4773b31a8c39b49b0257378f6da270b6f0 100644 (file)
--- a/src/t_set.c
+++ b/src/t_set.c
@@ -37,7 +37,7 @@ int setTypeAdd(robj *subject, robj *value) {
 
             /* The set *was* an intset and this value is not integer
              * encodable, so dictAdd should always work. */
 
             /* The set *was* an intset and this value is not integer
              * encodable, so dictAdd should always work. */

-            redisAssert(dictAdd(subject->ptr,value,NULL) == DICT_OK);
+            redisAssertWithInfo(NULL,value,dictAdd(subject->ptr,value,NULL) == DICT_OK);

             incrRefCount(value);
             return 1;
         }
             incrRefCount(value);
             return 1;
         }


@@ -115,7 +115,7 @@ int setTypeNext(setTypeIterator *si, robj **objele, int64_t *llele) {
     if (si->encoding == REDIS_ENCODING_HT) {
         dictEntry *de = dictNext(si->di);
         if (de == NULL) return -1;
     if (si->encoding == REDIS_ENCODING_HT) {
         dictEntry *de = dictNext(si->di);
         if (de == NULL) return -1;

-        *objele = dictGetEntryKey(de);
+        *objele = dictGetKey(de);

     } else if (si->encoding == REDIS_ENCODING_INTSET) {
         if (!intsetGet(si->subject->ptr,si->ii++,llele))
             return -1;
     } else if (si->encoding == REDIS_ENCODING_INTSET) {
         if (!intsetGet(si->subject->ptr,si->ii++,llele))
             return -1;


@@ -165,7 +165,7 @@ robj *setTypeNextObject(setTypeIterator *si) {
 int setTypeRandomElement(robj *setobj, robj **objele, int64_t *llele) {
     if (setobj->encoding == REDIS_ENCODING_HT) {
         dictEntry *de = dictGetRandomKey(setobj->ptr);
 int setTypeRandomElement(robj *setobj, robj **objele, int64_t *llele) {
     if (setobj->encoding == REDIS_ENCODING_HT) {
         dictEntry *de = dictGetRandomKey(setobj->ptr);

-        *objele = dictGetEntryKey(de);
+        *objele = dictGetKey(de);

     } else if (setobj->encoding == REDIS_ENCODING_INTSET) {
         *llele = intsetRandom(setobj->ptr);
     } else {
     } else if (setobj->encoding == REDIS_ENCODING_INTSET) {
         *llele = intsetRandom(setobj->ptr);
     } else {


@@ -185,12 +185,12 @@ unsigned long setTypeSize(robj *subject) {
 }
 
 /* Convert the set to specified encoding. The resulting dict (when converting
 }
 
 /* Convert the set to specified encoding. The resulting dict (when converting

- * to a hashtable) is presized to hold the number of elements in the original
+ * to a hash table) is presized to hold the number of elements in the original

  * set. */
 void setTypeConvert(robj *setobj, int enc) {
     setTypeIterator *si;
  * set. */
 void setTypeConvert(robj *setobj, int enc) {
     setTypeIterator *si;

-    redisAssert(setobj->type == REDIS_SET &&
-                setobj->encoding == REDIS_ENCODING_INTSET);
+    redisAssertWithInfo(NULL,setobj,setobj->type == REDIS_SET &&
+                             setobj->encoding == REDIS_ENCODING_INTSET);

 
     if (enc == REDIS_ENCODING_HT) {
         int64_t intele;
 
     if (enc == REDIS_ENCODING_HT) {
         int64_t intele;


@@ -204,7 +204,7 @@ void setTypeConvert(robj *setobj, int enc) {
         si = setTypeInitIterator(setobj);
         while (setTypeNext(si,NULL,&intele) != -1) {
             element = createStringObjectFromLongLong(intele);
         si = setTypeInitIterator(setobj);
         while (setTypeNext(si,NULL,&intele) != -1) {
             element = createStringObjectFromLongLong(intele);

-            redisAssert(dictAdd(d,element,NULL) == DICT_OK);
+            redisAssertWithInfo(NULL,element,dictAdd(d,element,NULL) == DICT_OK);

         }
         setTypeReleaseIterator(si);
 
         }
         setTypeReleaseIterator(si);