diff options
author | antirez <antirez@gmail.com> | 2015-04-28 22:10:23 +0200 |
---|---|---|
committer | antirez <antirez@gmail.com> | 2015-04-28 22:15:12 +0200 |
commit | 081a0c943f380422b62cd5b9a4c2e2d125eb36c9 (patch) | |
tree | b498bf2b035e024f5adb6b168d46ba289fdf7960 | |
parent | d593ae8ab65a19eedbc4b4b3e4e3790c2c640e4b (diff) | |
download | redis-081a0c943f380422b62cd5b9a4c2e2d125eb36c9.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.
-rw-r--r-- | deps/hiredis/async.c | 1 |
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; } |