2001-07-01 Jeremy Nimmer <jwnimmer@alum.mit.edu>

	For PR libgcj/3523:
	* java/io/LineNumberReader.java (reset): Pass correct arguments to
	countLines.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@43683 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 9e8fcaa..340531f 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2001-07-01  Jeremy Nimmer  <jwnimmer@alum.mit.edu>
+
+       For PR libgcj/3523:
+       * java/io/LineNumberReader.java (reset): Pass correct arguments to
+       countLines.
+
 2001-06-27  Tom Tromey  <tromey@redhat.com>
 
        * gnu/gcj/convert/IOConverter.java: Manually maintained alias now

diff --git a/libjava/java/io/LineNumberReader.java b/libjava/java/io/LineNumberReader.java
index ffdd2b6..1c57fe1 100644 (file)
--- a/libjava/java/io/LineNumberReader.java
+++ b/libjava/java/io/LineNumberReader.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999  Free Software Foundation
+/* Copyright (C) 1998, 1999, 2001  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -94,7 +94,7 @@ public class LineNumberReader extends BufferedReader
        if (markPos > 0 && pos > markPos && buffer[markPos-1] == '\r'
            && buffer[markPos] == '\n')
          lineNumber--;
-       lineNumber -= countLines(buffer, pos, markPos);
+       lineNumber -= countLines(buffer, markPos, pos - markPos);
        pos = markPos;
       }
   }