Merge pull request redis#215 from charliesome/fix-bugs

Fix a couple of bugs uncovered by the Clang static analyzer
wjin · Jan 15, 2014 · 065e905 · 065e905
2 parents cc3ee45 + 070da21
commit 065e905
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/async.c b/async.c
@@ -174,6 +174,11 @@ redisAsyncContext *redisAsyncConnectUnix(const char *path) {
         return NULL;
 
     ac = redisAsyncInitialize(c);
+    if (ac == NULL) {
+        redisFree(c);
+        return NULL;
+    }
+
     __redisAsyncCopyError(ac);
     return ac;
 }
@@ -398,7 +403,7 @@ void redisProcessCallbacks(redisAsyncContext *ac) {
                 __redisAsyncDisconnect(ac);
                 return;
             }
-            
+
             /* If monitor mode, repush callback */
             if(c->flags & REDIS_MONITORING) {
                 __redisPushCallback(&ac->replies,&cb);

diff --git a/sds.c b/sds.c
@@ -295,7 +295,11 @@ sds *sdssplitlen(char *s, int len, char *sep, int seplen, int *count) {
 #ifdef SDS_ABORT_ON_OOM
     if (tokens == NULL) sdsOomAbort();
 #endif
-    if (seplen < 1 || len < 0 || tokens == NULL) return NULL;
+    if (tokens == NULL) return NULL;
+    if (seplen < 1 || len < 0) {
+        free(tokens);
+        return NULL;
+    }
     if (len == 0) {
         *count = 0;
         return tokens;