Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions lib/parser/hiredis.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,20 @@ HiredisReplyParser.prototype.reset = function () {
HiredisReplyParser.prototype.execute = function (data) {
var reply;
this.reader.feed(data);
try {
while ((reply = this.reader.get()) !== undefined) {
if (reply && reply.constructor === Error) {
this.emit("reply error", reply);
} else {
this.emit("reply", reply);
}
while (true) {
try {
reply = this.reader.get();
} catch (err) {
this.emit("error", err);
break;
}

if (reply === undefined) break;

if (reply && reply.constructor === Error) {
this.emit("reply error", reply);
} else {
this.emit("reply", reply);
}
} catch (err) {
this.emit("error", err);
}
};
38 changes: 38 additions & 0 deletions tests/hiredis_parser.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
var Parser = require('../lib/parser/hiredis').Parser;
var assert = require('assert');

/*
This test makes sure that exceptions thrown inside of "reply" event handlers
are not trapped and mistakenly emitted as parse errors.
*/
(function testExecuteDoesNotCatchReplyCallbackExceptions() {
var parser = new Parser();
var replies = [{}];

parser.reader = {
feed: function() {},
get: function() {
return replies.shift();
}
};

var emittedError = false;
var caughtException = false;

parser
.on('error', function() {
emittedError = true;
})
.on('reply', function() {
throw new Error('bad');
});

try {
parser.execute();
} catch (err) {
caughtException = true;
}

assert.equal(caughtException, true);
assert.equal(emittedError, false);
})();