summaryrefslogtreecommitdiff
path: root/deps
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2015-04-28 22:10:23 +0200
committerantirez <antirez@gmail.com>2015-04-28 22:10:23 +0200
commitc806dd799bc8f3c578581194d499b50acec44b7d (patch)
treed498568bc8f9007af0a5f4dade0e9c7d61ee0bce /deps
parent1b25757f415d6e6da0cdf1769f94f8e318e5be25 (diff)
downloadredis-c806dd799bc8f3c578581194d499b50acec44b7d.tar.gz
Fix Sentinel memory leak (hiredis bug)
This fixes issue #2535, that was actually an hiredis library bug (I submitted an issue and fix to the redis/hiredis repo as well). When an asynchronous hiredis connection subscribes to a Pub/Sub channel and gets an error, and in other related conditions, the function redisProcessCallbacks() enters a code path where the link is disconnected, however the function returns before freeing the allocated reply object. This causes a memory leak. The memory leak was trivial to trigger in Redis Sentinel, which uses hiredis, every time we tried to subscribe to an instance that required a password, in case the Sentinel was configured either with the wrong password or without password at all. In this case, the -AUTH error caused the leaking code path to be executed. It was verified with Valgrind that after this change the leak no longer happens in Sentinel with a misconfigured authentication password.
Diffstat (limited to 'deps')
-rw-r--r--deps/hiredis/async.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/deps/hiredis/async.c b/deps/hiredis/async.c
index f7f343bef..9cc35638f 100644
--- a/deps/hiredis/async.c
+++ b/deps/hiredis/async.c
@@ -443,6 +443,7 @@ void redisProcessCallbacks(redisAsyncContext *ac) {
if (((redisReply*)reply)->type == REDIS_REPLY_ERROR) {
c->err = REDIS_ERR_OTHER;
snprintf(c->errstr,sizeof(c->errstr),"%s",((redisReply*)reply)->str);
+ c->reader->fn->freeObject(reply);
__redisAsyncDisconnect(ac);
return;
}