diff options
| author | warrenl <warrenl@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-04-07 19:31:01 +0000 |
|---|---|---|
| committer | warrenl <warrenl@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-04-07 19:31:01 +0000 |
| commit | a8392ca09e4e6a54c4a9ab85be1b0b3ed5b547ff (patch) | |
| tree | 19ea92129111f6c0712036d7877c3aab2ae44b50 /libjava/java/lang | |
| parent | 26cfe15040e41e21bd2c435e66545da9e15f0b12 (diff) | |
| download | ppe42-gcc-a8392ca09e4e6a54c4a9ab85be1b0b3ed5b547ff.tar.gz ppe42-gcc-a8392ca09e4e6a54c4a9ab85be1b0b3ed5b547ff.zip | |
* 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
Diffstat (limited to 'libjava/java/lang')
| -rw-r--r-- | libjava/java/lang/natString.cc | 4 |
1 files changed, 4 insertions, 0 deletions
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 |
