Merge pull request #147 from hdoreau/d7e3268f48b457cb52336d264f8860b336faea9f

Prevent hiredis from crashing on memory allocation failure

1 files changed, 7 insertions, 2 deletions

diff --git a/example.c b/example.c
index 378ef71..d9d7271 100644
--- a/example.c
+++ b/example.c
@@ -11,8 +11,13 @@ int main(void) {
 
     struct timeval timeout = { 1, 500000 }; // 1.5 seconds
     c = redisConnectWithTimeout((char*)"127.0.0.1", 6379, timeout);
-    if (c->err) {
-        printf("Connection error: %s\n", c->errstr);
+    if (c == NULL || c->err) {
+        if (c) {
+            printf("Connection error: %s\n", c->errstr);
+            redisFree(c);
+        } else {
+            printf("Connection error: can't allocate redis context\n");
+        }
         exit(1);
     }