natString.cc (init(jbyteArray,jint,jint,jstring)): Set count to 0 when InputStreamRea...

	* java/lang/natString.cc (init(jbyteArray,jint,jint,jstring)):
	Set count to 0 when InputStreamReader returns -1 for EOF.

From-SVN: r26273

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index a624e4ebb6a5fdc3d1b3531e25c6c4ae76d9e2f7..1d3bb42afcf178920bb5d0c67bccebd280031185 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+1999-04-07  Warren Levy  <warrenl@cygnus.com>
+
+       * java/lang/natString.cc (init(jbyteArray,jint,jint,jstring)):
+       Set count to 0 when InputStreamReader returns -1 for EOF.
+
 1999-04-07  Tom Tromey  <tromey@cygnus.com>
 
        * mauve-libgcj: Omit java.text.Collator,

diff --git a/libjava/java/lang/natString.cc b/libjava/java/lang/natString.cc
index 5cb7b2c72b4a6197442d648cfe8b1a116b6e99a7..8aad9ee4b8c66d41f25a89096ed5b6e35a337bf9 100644 (file)
--- a/libjava/java/lang/natString.cc
+++ b/libjava/java/lang/natString.cc
@@ -392,6 +392,10 @@ java::lang::String::init (jbyteArray bytes, jint offset, jint count,
   boffset = (char *) elements (array) - (char *) array;
   // FIXME: this can throw IOException.
   this->count = ir->read(array, 0, count);
+
+  // In case read() doesn't read anything, change -1 for EOF to a count of 0.
+  if (this->count < 0)
+    this->count = 0;
 }
 
 jboolean