Only check REDIS_FREEING when a callback was executed

koenvandesande · Dec 28, 2010 · c882a36 · c882a36
1 parent e3776bf
commit c882a36
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/async.c b/async.c
@@ -246,15 +246,15 @@ void redisProcessCallbacks(redisAsyncContext *ac) {
         assert(__redisShiftCallback(&ac->replies,&cb) == REDIS_OK);
         if (cb.fn != NULL) {
             cb.fn(ac,reply,cb.privdata);
+
+            /* Proceed with free'ing when redisAsyncFree() was called. */
+            if (c->flags & REDIS_FREEING) {
+                __redisAsyncFree(ac);
+                return;
+            }
         } else {
             c->fn->freeObject(reply);
         }
-
-        /* Proceed with free'ing when redisAsyncFree() was called. */
-        if (c->flags & REDIS_FREEING) {
-            __redisAsyncFree(ac);
-            return;
-        }
     }
 
     /* Disconnect when there was an error reading the reply */