Helpers to move around in encoded sorted set

[redis.git] / src / sds.c

diff --git a/src/sds.c b/src/sds.c
index da049f6cecce85e2622392213a6999862a24e48b..67e2d4565965677269ec7a27f1a792a0d1b23606 100644 (file)
--- a/src/sds.c
+++ b/src/sds.c
@@ -305,7 +305,10 @@ sds *sdssplitlen(char *s, int len, char *sep, int seplen, int *count) {
 #ifdef SDS_ABORT_ON_OOM
     if (tokens == NULL) sdsOomAbort();
 #endif
 #ifdef SDS_ABORT_ON_OOM
     if (tokens == NULL) sdsOomAbort();
 #endif

-    if (seplen < 1 || len < 0 || tokens == NULL) return NULL;
+    if (seplen < 1 || len < 0 || tokens == NULL) {
+        *count = 0;
+        return NULL;
+    }

     if (len == 0) {
         *count = 0;
         return tokens;
     if (len == 0) {
         *count = 0;
         return tokens;


@@ -360,6 +363,7 @@ cleanup:
         int i;
         for (i = 0; i < elements; i++) sdsfree(tokens[i]);
         zfree(tokens);
         int i;
         for (i = 0; i < elements; i++) sdsfree(tokens[i]);
         zfree(tokens);

+        *count = 0;

         return NULL;
     }
 #endif
         return NULL;
     }
 #endif