code/wrench-js
Archived
1
Fork 0
Code Issues 22 Pull requests 7 Projects Releases Packages Wiki Activity Actions

FIX: LineReader.hasNextLine go to an endless loop

Browse source 
LineReader.hasNextLine will go to an endless loop when buffer is empty
or file not end with \n
This commit is contained in:
perfectworks 2012-02-22 17:43:31 +08:00
parent 92a4dffb11
commit 48aa600052
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/wrench.js
View file

@ -368,9 +368,12 @@ exports.LineReader.prototype = {
var res = fs.readSync(this.fd, this.bufferSize, position, "ascii"); var res = fs.readSync(this.fd, this.bufferSize, position, "ascii");
this.buffer += res[0]; this.buffer += res[0];
if(res[1] === 0) return -1; if(res[1] === 0) {
this.currentPosition = -1;
} else {
this.currentPosition = position + res[1]; this.currentPosition = position + res[1];
}
return this.currentPosition; return this.currentPosition;
}, },
@ -378,7 +381,6 @@ exports.LineReader.prototype = {
while(this.buffer.indexOf('\n') === -1) { while(this.buffer.indexOf('\n') === -1) {
this.getBufferAndSetCurrentPosition(this.currentPosition); this.getBufferAndSetCurrentPosition(this.currentPosition);
if(this.currentPosition === -1) return false; if(this.currentPosition === -1) return false;
if(this.buffer.length === 0) return false;
} }
if(this.buffer.indexOf("\n") > -1) return true; if(this.buffer.indexOf("\n") > -1) return true;