From bb13476e737d6af372256464aa1cf5a5354688fd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9s=20J=2E=20D=C3=ADaz?= Date: Wed, 2 Mar 2016 19:21:56 +0100 Subject: [PATCH] Fix memory leak in redis.c --- src/redis.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/redis.c b/src/redis.c index 3f78bc3d..2586ca0c 100644 --- a/src/redis.c +++ b/src/redis.c @@ -399,25 +399,27 @@ static int redis_read (void) /* {{{ */ if (strlen (rn->passwd) > 0) { - DEBUG ("redis plugin: authenticanting node `%s' passwd(%s).", rn->name, rn->passwd); - rr = redisCommand (rh, "AUTH %s", rn->passwd); + DEBUG ("redis plugin: authenticating node `%s' passwd(%s).", rn->name, rn->passwd); - if (rr == NULL || rr->type != REDIS_REPLY_STATUS) + if ((rr = redisCommand (rh, "AUTH %s", rn->passwd)) == NULL) { WARNING ("redis plugin: unable to authenticate on node `%s'.", rn->name); - if (rr != NULL) - freeReplyObject (rr); + goto redis_fail; + } - redisFree (rh); - continue; + if (rr->type != REDIS_REPLY_STATUS) + { + WARNING ("redis plugin: invalid authentication on node `%s'.", rn->name); + goto redis_fail; } + + freeReplyObject (rr); } if ((rr = redisCommand(rh, "INFO")) == NULL) { - WARNING ("redis plugin: unable to connect to node `%s'.", rn->name); - redisFree (rh); - continue; + WARNING ("redis plugin: unable to get info from node `%s'.", rn->name); + goto redis_fail; } redis_handle_info (rn->name, rr->str, "uptime", NULL, "uptime_in_seconds", DS_TYPE_GAUGE); @@ -434,11 +436,12 @@ static int redis_read (void) /* {{{ */ redis_handle_info (rn->name, rr->str, "pubsub", "patterns", "pubsub_patterns", DS_TYPE_GAUGE); redis_handle_info (rn->name, rr->str, "current_connections", "slaves", "connected_slaves", DS_TYPE_GAUGE); - freeReplyObject (rr); - for (rq = rn->queries; rq != NULL; rq = rq->next) redis_handle_query(rh, rn, rq); +redis_fail: + if (rr != NULL) + freeReplyObject (rr); redisFree (rh); } -- 2.11.0