Fix potential memleaks spotted by infer 1.3

Author: attipaci

src/redisx-net.c

@@ -256,11 +256,10 @@ static int rAuthAsync(RedisClient *cl) {
   prop_error(fn, status);
 
   reply = redisxReadReplyAsync(cl, &status);
-  prop_error(fn, status);
+  if(!status)
+    status = redisxCheckRESP(reply, RESP_SIMPLE_STRING, -1);
 
-  status = redisxCheckRESP(reply, RESP_SIMPLE_STRING, -1);
   redisxDestroyRESP(reply);
-
   prop_error(fn, status);
 
   return X_SUCCESS;

src/redisx-sentinel.c

@@ -140,18 +140,27 @@ int rConfirmMasterRoleAsync(Redis *redis) {
   prop_error(fn, status);
 
   reply = redisxReadReplyAsync(redis->interactive, &status);
-  prop_error(fn, status);
+  if(status) {
+    redisxDestroyRESP(reply);
+    x_trace(fn, "ROLE", status);
+  }
 
   if(redisxCheckDestroyRESP(reply, RESP_ARRAY, 0) != X_SUCCESS) {
     // Fallback to using INFO replication...
     XLookupTable *info;
     const XField *role;
 
     status = redisxSendRequestAsync(redis->interactive, "INFO", "replication", NULL, NULL);
-    prop_error(fn, status);
+    if(status) {
+      redisxDestroyRESP(reply);
+      x_trace(fn, "sendRequestAsync(INFO)", status);
+    }
 
     reply = redisxReadReplyAsync(redis->interactive, &status);
-    prop_error(fn, status);
+    if(status) {
+      redisxDestroyRESP(reply);
+      x_trace(fn, "readReplyAsync(INFO)", status);
+    }
 
     info = rConsumeInfoReply(reply);
     if(!info) return x_trace(fn, NULL, X_FAILURE);
@@ -216,7 +225,10 @@ int rDiscoverSentinelAsync(Redis *redis) {
     if(status) continue;
 
     reply = redisxReadReplyAsync(redis->interactive, &status);
-    if(status) continue;
+    if(status) {
+      redisxDestroyRESP(reply);
+      continue;
+    }
 
     if(redisxCheckDestroyRESP(reply, RESP_ARRAY, 2) == X_SUCCESS) {
       RESP **component = (RESP **) reply->value;

src/redisx.c

@@ -423,10 +423,7 @@ static int redisxSelectDBAsync(RedisClient *cl, int idx, boolean confirm) {
   if(confirm) {
     int status = X_SUCCESS;
     RESP *reply = redisxReadReplyAsync(cl, &status);
-
-    prop_error(fn, status);
-
-    status = redisxCheckRESP(reply, RESP_SIMPLE_STRING, 0);
+    if(!status) status = redisxCheckRESP(reply, RESP_SIMPLE_STRING, 0);
     if(!status) if(strcmp("OK", (char *) reply->value) != 0)
       status = x_error(REDIS_UNEXPECTED_RESP, ENOMSG, fn, "expected 'OK', got '%s'", (char *) reply->value);
     redisxDestroyRESP(reply);
@@ -881,7 +878,7 @@ XLookupTable *rConsumeInfoReply(RESP *reply) {
 
   // Parse key:value lines into a structure.
   while(line) {
-    char *sep = strchr(line, ':');
+    char *sep = strchr((char *) line, ':');
     if(sep) {
       *sep = '\0';
       xSetField(s, xCreateStringField(line, sep + 1));

src/resp.c

@@ -739,7 +739,10 @@ XField *redisxRESP2XField(const char *name, const RESP *resp) {
  * @sa redisxPrintJSON()
  */
 char *redisxRESP2JSON(const char *name, const RESP *resp) {
-  return xjsonFieldToString(redisxRESP2XField(name, resp));
+  XField *f = redisxRESP2XField(name, resp);
+  char *s = xjsonFieldToString(f);
+  xDestroyField(f);
+  return s;
 }
 
 /**