From a0d34edd00b42849901865e0a96b6a96f256bb80 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Fri, 27 Oct 2017 10:55:20 +0100 Subject: [Fix] Fix couple of warnings --- contrib/hiredis/dict.c | 8 +++++--- contrib/hiredis/hiredis.c | 4 ++++ 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'contrib/hiredis') diff --git a/contrib/hiredis/dict.c b/contrib/hiredis/dict.c index e17a62546..0fbc1b4cf 100644 --- a/contrib/hiredis/dict.c +++ b/contrib/hiredis/dict.c @@ -172,9 +172,11 @@ static int dictReplace(dict *ht, void *key, void *val) { * as the previous one. In this context, think to reference counting, * you want to increment (set), and then decrement (free), and not the * reverse. */ - auxentry = *entry; - dictSetHashVal(ht, entry, val); - dictFreeEntryVal(ht, &auxentry); + if (entry) { + auxentry = *entry; + dictSetHashVal(ht, entry, val); + dictFreeEntryVal(ht, &auxentry); + } return 0; } diff --git a/contrib/hiredis/hiredis.c b/contrib/hiredis/hiredis.c index 2b876d913..0f87bc323 100644 --- a/contrib/hiredis/hiredis.c +++ b/contrib/hiredis/hiredis.c @@ -710,6 +710,8 @@ redisContext *redisConnectNonBlock(const char *ip, int port) { redisContext *redisConnectBindNonBlock(const char *ip, int port, const char *source_addr) { redisContext *c = redisContextInit(); + if (c == NULL) + return NULL; c->flags &= ~REDIS_BLOCK; redisContextConnectBindTcp(c,ip,port,NULL,source_addr); return c; @@ -718,6 +720,8 @@ redisContext *redisConnectBindNonBlock(const char *ip, int port, redisContext *redisConnectBindNonBlockWithReuse(const char *ip, int port, const char *source_addr) { redisContext *c = redisContextInit(); + if (c == NULL) + return NULL; c->flags &= ~REDIS_BLOCK; c->flags |= REDIS_REUSEADDR; redisContextConnectBindTcp(c,ip,port,NULL,source_addr); -- cgit v1.2.3