From a8392ca09e4e6a54c4a9ab85be1b0b3ed5b547ff Mon Sep 17 00:00:00 2001
From: warrenl <warrenl@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 7 Apr 1999 19:31:01 +0000
Subject: 	* java/lang/natString.cc (init(jbyteArray,jint,jint,jstring)):
 	Set count to 0 when InputStreamReader returns -1 for EOF.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@26273 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/java/lang/natString.cc | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'libjava/java/lang')

diff --git a/libjava/java/lang/natString.cc b/libjava/java/lang/natString.cc
index 5cb7b2c72b4..8aad9ee4b8c 100644
--- 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
-- 
cgit v1.2.3