archive-gh-me/node-postgres
1
0
Fork 0
mirror of https://github.com/brianc/node-postgres.git synced 2026-01-18 15:55:05 +00:00
Code Issues Projects Releases Wiki Activity

Avoid infinite loop on malformed message (#1208)

Browse Source 
* Avoid infinite loop on malformed message

If handling of such messages is deemed unimportant, `indexOf` is still faster (~40%) and cleaner than a manual loop.

Addresses #1048 to an extent.

* Use indexOf fallback for Node ≤0.12
This commit is contained in:
Charmander 2017-02-21 09:19:03 -08:00 committed by Brian C
parent 5b6d883723
commit 41017814d3
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/connection.js
View File

@ -13,6 +13,21 @@ var util = require('util');
var Writer = require('buffer-writer');
var Reader = require('packet-reader');
var indexOf =
'indexOf' in Buffer.prototype ?
function indexOf(buffer, value, start) {
return buffer.indexOf(value, start);
} :
function indexOf(buffer, value, start) {
for (var i = start, len = buffer.length; i < len; i++) {
if (buffer[i] === value) {
return i;
}
}
return -1;
};
var TEXT_MODE = 0;
var BINARY_MODE = 1;
var Connection = function(config) {
@ -647,8 +662,9 @@ Connection.prototype.readBytes = function(buffer, length) {
Connection.prototype.parseCString = function(buffer) {
var start = this.offset;
while(buffer[this.offset++] !== 0) { }
return buffer.toString(this.encoding, start, this.offset - 1);
var end = indexOf(buffer, 0, start);
this.offset = end + 1;
return buffer.toString(this.encoding, start, end);
};
//end parsing methods
module.exports = Connection;