Merge pull request ryanmcgrath#20 from perfectworks/master

LineReader.hasNextLine will go to an endless loop
node-migrator-bot · Feb 22, 2012 · e0e9f52 · e0e9f52
2 parents 6caa8c9 + 48aa600
commit e0e9f52
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/wrench.js b/lib/wrench.js
@@ -368,17 +368,19 @@ exports.LineReader.prototype = {
         var res = fs.readSync(this.fd, this.bufferSize, position, "ascii");
 
         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;
     },
 
     hasNextLine: function() {
         while(this.buffer.indexOf('\n') === -1) {
             this.getBufferAndSetCurrentPosition(this.currentPosition);
             if(this.currentPosition === -1) return false;
-            if(this.buffer.length === 0) return false;
         }
 
         if(this.buffer.indexOf("\n") > -1) return true;