1 files changed, 33 insertions, 12 deletions

diff --git a/hiredis.c b/hiredis.c
index 3c8736d..456067c 100644
--- a/hiredis.c
+++ b/hiredis.c
@@ -207,10 +207,14 @@ static int processLineItem(redisReader *r) {
     int len;
 
     if ((p = readLine(r,&len)) != NULL) {
-        if (cur->type == REDIS_REPLY_INTEGER) {
-            obj = r->fn->createInteger(cur,strtoll(p,NULL,10));
+        if (r->fn) {
+            if (cur->type == REDIS_REPLY_INTEGER) {
+                obj = r->fn->createInteger(cur,strtoll(p,NULL,10));
+            } else {
+                obj = r->fn->createString(cur,p,len);
+            }
         } else {
-            obj = r->fn->createString(cur,p,len);
+            obj = (void*)(size_t)(cur->type);
         }
 
         /* If there is no root yet, register this object as root. */
@@ -238,12 +242,14 @@ static int processBulkItem(redisReader *r) {
 
         if (len < 0) {
             /* The nil object can always be created. */
-            obj = r->fn->createNil(cur);
+            obj = r->fn ? r->fn->createNil(cur) :
+                (void*)REDIS_REPLY_NIL;
         } else {
             /* Only continue when the buffer contains the entire bulk item. */
             bytelen += len+2; /* include \r\n */
             if (r->pos+bytelen <= sdslen(r->buf)) {
-                obj = r->fn->createString(cur,s+2,len);
+                obj = r->fn ? r->fn->createString(cur,s+2,len) :
+                    (void*)REDIS_REPLY_STRING;
             }
         }
 
@@ -268,10 +274,12 @@ static int processMultiBulkItem(redisReader *r) {
     if ((p = readLine(r,NULL)) != NULL) {
         elements = strtol(p,NULL,10);
         if (elements == -1) {
-            obj = r->fn->createNil(cur);
+            obj = r->fn ? r->fn->createNil(cur) :
+                (void*)REDIS_REPLY_NIL;
             moveToNextTask(r);
         } else {
-            obj = r->fn->createArray(cur,elements);
+            obj = r->fn ? r->fn->createArray(cur,elements) :
+                (void*)REDIS_REPLY_ARRAY;
 
             /* Modify task stack when there are more than 0 elements. */
             if (elements > 0) {
@@ -348,15 +356,26 @@ static int processItem(redisReader *r) {
     }
 }
 
-void *redisReplyReaderCreate(redisReplyObjectFunctions *fn) {
+void *redisReplyReaderCreate() {
     redisReader *r = calloc(sizeof(redisReader),1);
     r->error = NULL;
-    r->fn = fn == NULL ? &defaultFunctions : fn;
+    r->fn = &defaultFunctions;
     r->buf = sdsempty();
     r->ridx = -1;
     return r;
 }
 
+/* Set the function set to build the reply. Returns REDIS_OK when there
+ * is no temporary object and it can be set, REDIS_ERR otherwise. */
+int redisReplyReaderSetReplyObjectFunctions(void *reader, redisReplyObjectFunctions *fn) {
+    redisReader *r = reader;
+    if (r->reply == NULL) {
+        r->fn = fn;
+        return REDIS_OK;
+    }
+    return REDIS_ERR;
+}
+
 /* External libraries wrapping hiredis might need access to the temporary
  * variable while the reply is built up. When the reader contains an
  * object in between receiving some bytes to parse, this object might
@@ -370,7 +389,7 @@ void redisReplyReaderFree(void *reader) {
     redisReader *r = reader;
     if (r->error != NULL)
         sdsfree(r->error);
-    if (r->reply != NULL)
+    if (r->reply != NULL && r->fn)
         r->fn->freeObject(r->reply);
     if (r->buf != NULL)
         sdsfree(r->buf);
@@ -695,8 +714,10 @@ int redisSetReplyObjectFunctions(redisContext *c, redisReplyObjectFunctions *fn)
 
 /* Helper function to lazily create a reply reader. */
 static void __redisCreateReplyReader(redisContext *c) {
-    if (c->reader == NULL)
-        c->reader = redisReplyReaderCreate(c->fn);
+    if (c->reader == NULL) {
+        c->reader = redisReplyReaderCreate();
+        assert(redisReplyReaderSetReplyObjectFunctions(c->reader,c->fn) == REDIS_OK);
+    }
 }
 
 /* Use this function to handle a read event on the descriptor. It will try