use tclsh8.5 not only in which but also in the actual test execution.

[redis.git] / src / sds.c

diff --git a/src/sds.c b/src/sds.c
index 343ad1fa7fc662ae9641b6da832e9e386199db65..63507000b106e6fefc8a8d099f1f68d9f846afe9 100644 (file)
--- a/src/sds.c
+++ b/src/sds.c
@@ -298,15 +298,17 @@ int sdscmp(sds s1, sds s2) {
  */
 sds *sdssplitlen(char *s, int len, char *sep, int seplen, int *count) {
     int elements = 0, slots = 5, start = 0, j;
+    sds *tokens;
 
-    sds *tokens = zmalloc(sizeof(sds)*slots);
+    if (seplen < 1 || len < 0) return NULL;
+
+    tokens = zmalloc(sizeof(sds)*slots);
 #ifdef SDS_ABORT_ON_OOM
     if (tokens == NULL) sdsOomAbort();
+#else
+    if (tokens == NULL) return NULL;
 #endif
-    if (seplen < 1 || len < 0 || tokens == NULL) {
-        *count = 0;
-        return NULL;
-    }
+
     if (len == 0) {
         *count = 0;
         return tokens;