Merge pull request #4 from itfanr/master

jacket-code · web-flow · commit f9f56187bab5 · 2018-02-05T18:23:59.000+08:00
fix the bug during adding ip addresses of the redis-servers
diff --git a/hiredis/hiredis.c b/hiredis/hiredis.c
@@ -1045,7 +1045,14 @@ redisContext *redisConnectWithTimeout(const char *ip, int port, const struct tim
         return NULL;
 
     c->flags |= REDIS_BLOCK;
-    redisContextConnectTcp(c,ip,port,&tv);
+	
+    int r = redisContextConnectTcp(c,ip,port,&tv);
+	if(REDIS_ERR == r){		
+		if(c){
+			free(c) ;
+			c = NULL ;
+		}
+	}
     return c;
 }
 
diff --git a/redlock-cpp/redlock.cpp b/redlock-cpp/redlock.cpp
@@ -103,9 +103,9 @@ bool CRedLock::Initialize() {
 // add redis server
 // ----------------
 bool CRedLock::AddServerUrl(const char *ip, const int port) {
-    redisContext *c;
+    redisContext *c = NULL;
     struct timeval timeout = { 1, 500000 }; // 1.5 seconds
-    c = redisConnectWithTimeout(ip, port, timeout);
+    c = redisConnectWithTimeout(ip, port, timeout);	
     if (c) {
         m_redisServer.push_back(c);
     }
