From 9a566c09260a094d6d8416bd3c8c3783bcd40f5a Mon Sep 17 00:00:00 2001 From: Warren Levy Date: Wed, 7 Apr 1999 19:31:01 +0000 Subject: natString.cc (init(jbyteArray,jint,jint,jstring)): Set count to 0 when InputStreamReader returns -1 for EOF. * java/lang/natString.cc (init(jbyteArray,jint,jint,jstring)): Set count to 0 when InputStreamReader returns -1 for EOF. From-SVN: r26273 --- libjava/java/lang/natString.cc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libjava/java') diff --git a/libjava/java/lang/natString.cc b/libjava/java/lang/natString.cc index 5cb7b2c..8aad9ee 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.1