Unverified Commit c96d4922 authored by Michael Grunder's avatar Michael Grunder Committed by GitHub
Browse files

Merge pull request #741 from redis/redisgetreply-null

Free the reply in redisGetReply when passed NULL
parents b2d1ad64 ac0b186a
...@@ -945,8 +945,13 @@ int redisGetReply(redisContext *c, void **reply) { ...@@ -945,8 +945,13 @@ int redisGetReply(redisContext *c, void **reply) {
} while (aux == NULL); } while (aux == NULL);
} }
/* Set reply object */ /* Set reply or free it if we were passed NULL */
if (reply != NULL) *reply = aux; if (reply != NULL) {
*reply = aux;
} else {
freeReplyObject(aux);
}
return REDIS_OK; return REDIS_OK;
} }
......
...@@ -591,6 +591,11 @@ static void test_blocking_connection(struct config config) { ...@@ -591,6 +591,11 @@ static void test_blocking_connection(struct config config) {
strcasecmp(reply->element[1]->str,"pong") == 0); strcasecmp(reply->element[1]->str,"pong") == 0);
freeReplyObject(reply); freeReplyObject(reply);
/* Make sure passing NULL to redisGetReply is safe */
test("Can pass NULL to redisGetReply: ");
assert(redisAppendCommand(c, "PING") == REDIS_OK);
test_cond(redisGetReply(c, NULL) == REDIS_OK);
disconnect(c, 0); disconnect(c, 0);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment