redis/node-redis
1
0
Fork 0
mirror of https://github.com/redis/node-redis.git synced 2025-08-10 11:43:01 +03:00
Code Activity

Merge pull request #903 from NodeRedis/parser

Browse Source 
Fix and simplify parser

Fixes #875 
Fixes #902
This commit is contained in:
Ruben Bridgewater
2015-10-27 17:28:13 +01:00
parent d00c5c1cbe 5d08132f7c
commit 5855dbc1b7
3 changed files with 16 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
changelog.md
View File

@@ -1,6 +1,10 @@
Changelog Changelog
========= =========
Bugfixes
- Fixed a js parser error that could result in a timeout ([@BridgeAR](https://github.com/BridgeAR))
## v.2.2.5 - 18 Oct, 2015 ## v.2.2.5 - 18 Oct, 2015
Bugfixes Bugfixes

39
lib/parsers/javascript.js
View File

@@ -22,13 +22,9 @@ JavascriptReplyParser.prototype._parseResult = function (type) {
if (type === 43 || type === 58 || type === 45) { // + or : or - if (type === 43 || type === 58 || type === 45) { // + or : or -
// up to the delimiter // up to the delimiter
end = this._packetEndOffset() - 1; end = this._packetEndOffset();
start = this._offset; start = this._offset;
if (end > this._buffer.length) {
throw new IncompleteReadBuffer('Wait for more data.');
}
// include the delimiter // include the delimiter
this._offset = end + 2; this._offset = end + 2;
@@ -91,13 +87,15 @@ JavascriptReplyParser.prototype._parseResult = function (type) {
} }
return reply; return reply;
} else {
return null;
} }
}; };
JavascriptReplyParser.prototype.execute = function (buffer) { JavascriptReplyParser.prototype.execute = function (buffer) {
this.append(buffer); this.append(buffer);
var type, ret, offset; var type, offset;
while (true) { while (true) {
offset = this._offset; offset = this._offset;
@@ -109,33 +107,17 @@ JavascriptReplyParser.prototype.execute = function (buffer) {
try { try {
type = this._buffer[this._offset++]; type = this._buffer[this._offset++];
if (type === 43) { // Strings + if (type === 43 || type === 58 || type === 36) { // Strings + // Integers : // Bulk strings $
ret = this._parseResult(type); this.send_reply(this._parseResult(type));
this.send_reply(ret);
} else if (type === 45) { // Errors - } else if (type === 45) { // Errors -
ret = this._parseResult(type); this.send_error(this._parseResult(type));
this.send_error(ret);
} else if (type === 58) { // Integers :
ret = this._parseResult(type);
this.send_reply(ret);
} else if (type === 36) { // Bulk strings $
ret = this._parseResult(type);
this.send_reply(ret);
} else if (type === 42) { // Arrays * } else if (type === 42) { // Arrays *
// set a rewind point. if a failure occurs, // set a rewind point. if a failure occurs,
// wait for the next execute()/append() and try again // wait for the next execute()/append() and try again
offset = this._offset - 1; offset = this._offset - 1;
ret = this._parseResult(type); this.send_reply(this._parseResult(type));
} else if (type !== 10 && type !== 13) {
this.send_reply(ret);
} else if (type === 10 || type === 13) {
break;
} else {
var err = new Error('Protocol error, got "' + String.fromCharCode(type) + '" as reply type byte'); var err = new Error('Protocol error, got "' + String.fromCharCode(type) + '" as reply type byte');
this.send_error(err); this.send_error(err);
} }
@@ -162,7 +144,7 @@ JavascriptReplyParser.prototype.append = function (newBuffer) {
}; };
JavascriptReplyParser.prototype.parseHeader = function () { JavascriptReplyParser.prototype.parseHeader = function () {
var end = this._packetEndOffset(), var end = this._packetEndOffset() + 1,
value = this._buffer.toString('ascii', this._offset, end - 1) | 0; value = this._buffer.toString('ascii', this._offset, end - 1) | 0;
this._offset = end + 1; this._offset = end + 1;
@@ -182,7 +164,6 @@ JavascriptReplyParser.prototype._packetEndOffset = function () {
} }
} }
offset++;
return offset; return offset;
}; };

7
test/parser.spec.js
View File

@@ -55,7 +55,7 @@ describe('parsers', function () {
return done(); return done();
}); });
it('line breaks in the beginning', function (done) { it('line breaks in the beginning of the last chunk', function (done) {
var parser = new Parser(); var parser = new Parser();
var reply_count = 0; var reply_count = 0;
function check_reply(reply) { function check_reply(reply) {
@@ -68,10 +68,7 @@ describe('parsers', function () {
parser.execute(new Buffer('*1\r\n*1\r\n$1\r\na')); parser.execute(new Buffer('*1\r\n*1\r\n$1\r\na'));
parser.execute(new Buffer('\r\n*1\r\n*1\r')); parser.execute(new Buffer('\r\n*1\r\n*1\r'));
parser.execute(new Buffer('\n$1\r\na\r\n')); parser.execute(new Buffer('\n$1\r\na\r\n*1\r\n*1\r\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'));
assert.equal(reply_count, 3, "check reply should have been called three times"); assert.equal(reply_count, 3, "check reply should have been called three times");
return done(); return done();