From 92ed0befc192409d705a807feb025dbffbebf380 Mon Sep 17 00:00:00 2001
From: Bryce Baril <bryce.baril@gmail.com>
Date: Sat, 23 Feb 2013 21:15:11 -0800
Subject: [PATCH] In nested MULTIBULK buffers, correctly recurse on an
 incomplete read buffer.

Signed-off-by: DTrejo <david.daniel.trejo@gmail.com>
---
 lib/parser/javascript.js | 10 +++++-----
 test.js                  | 29 +++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/lib/parser/javascript.js b/lib/parser/javascript.js
index de8e4602ef..0990cc098d 100644
--- a/lib/parser/javascript.js
+++ b/lib/parser/javascript.js
@@ -117,15 +117,15 @@ ReplyParser.prototype._parseResult = function (type) {
         offset = this._offset;
         packetHeader = new Packet(type, this.parseHeader());
 
-        if (packetHeader.size > this._bytesRemaining()) {
-            this._offset = offset - 1;
-            return -1;
-        }
-
         if (packetHeader.size < 0) {
             return null;
         }
 
+        if (packetHeader.size > this._bytesRemaining()) {
+            this._offset = offset - 1;
+            throw new IncompleteReadBuffer("Wait for more data.");
+        }
+
         var reply = [ ];
         var ntype, i, res;
 
diff --git a/test.js b/test.js
index bb0ca604bf..b790f5f64d 100644
--- a/test.js
+++ b/test.js
@@ -291,6 +291,35 @@ tests.MULTI_6 = function () {
         });
 };
 
+tests.MULTI_7 = function () {
+    var name = "MULTI_7";
+
+    if (bclient.reply_parser.name != "javascript") {
+        console.log("Skipping wire-protocol test for 3rd-party parser");
+        return next(name);
+    }
+
+    var p = require("./lib/parser/javascript");
+    var parser = new p.Parser(false);
+    var reply_count = 0;
+    function check_reply(reply) {
+        assert.deepEqual(reply, [['a']], "Expecting multi-bulk reply of [['a']]");
+        reply_count++;
+        assert.notEqual(reply_count, 4, "Should only parse 3 replies");
+    }
+    parser.on("reply", check_reply);
+
+    parser.execute(new Buffer('*1\r\n*1\r\n$1\r\na\r\n'));
+
+    parser.execute(new Buffer('*1\r\n*1\r'));
+    parser.execute(new Buffer('\n$1\r\na\r\n'));
+
+    parser.execute(new Buffer('*1\r\n*1\r\n'));
+    parser.execute(new Buffer('$1\r\na\r\n'));
+
+    next(name);
+};
+
 tests.FWD_ERRORS_1 = function () {
     var name = "FWD_ERRORS_1";