From 72688572548655cbd16178ae096f5d4b73ed03dc Mon Sep 17 00:00:00 2001 From: Blake Matheny Date: Tue, 24 May 2011 11:46:19 -0400 Subject: Fix the case where an error reply is received before any callbacks are registered --- async.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/async.c b/async.c index 4dc6a47..b085096 100644 --- a/async.c +++ b/async.c @@ -361,7 +361,17 @@ void redisProcessCallbacks(redisAsyncContext *ac) { /* Even if the context is subscribed, pending regular callbacks will * get a reply before pub/sub messages arrive. */ if (__redisShiftCallback(&ac->replies,&cb) != REDIS_OK) { - /* No more regular callbacks, the context *must* be subscribed. */ + // error reply before any callbacks were setup + if ( ((redisReply*)reply)->type == REDIS_REPLY_ERROR ) { + c->err = REDIS_ERR_OTHER; + err_len = strlen(((redisReply*)reply)->str); + err_len = err_len < (sizeof(c->errstr)-1) ? err_len : (sizeof(c->errstr)-1); + memcpy(c->errstr, ((redisReply*)reply)->str, err_len); + c->errstr[err_len] = '\0'; + __redisAsyncDisconnect(ac); + return; + } + /* No more regular callbacks and no errors, the context *must* be subscribed. */ assert(c->flags & REDIS_SUBSCRIBED); __redisGetSubscribeCallback(ac,reply,&cb); } -- cgit v1.2.3