diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-04-21 11:49:39 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-04-21 11:49:39 +0000 |
| commit | f2f4980f6dab2c1bf9fe8105853fd0e9705bb4fc (patch) | |
| tree | ea495ba5926a151ef878bb522692413c8b7560a6 | |
| parent | be484f7ad5bb820beca1e55fd600dd0faeb0eb5b (diff) | |
| download | gcc-f2f4980f6dab2c1bf9fe8105853fd0e9705bb4fc.tar.gz | |
* java/lang/natString.cc (getBytes): Correctly size result
buffer. From Bryce McKinlay <bryce@albatross.co.nz>.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@26575 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/lang/natString.cc | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 027819a83ed..daba9ef890c 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +1999-04-21 Tom Tromey <tromey@cygnus.com> + + * java/lang/natString.cc (getBytes): Correctly size result + buffer. From Bryce McKinlay <bryce@albatross.co.nz>. + 1999-04-20 Andrew Haley <aph@cygnus.com> * include/sparc-signal.h: new file. diff --git a/libjava/java/lang/natString.cc b/libjava/java/lang/natString.cc index a5984856dff..cbd36bb3f97 100644 --- a/libjava/java/lang/natString.cc +++ b/libjava/java/lang/natString.cc @@ -487,8 +487,8 @@ java::lang::String::getBytes (jstring enc) } if (bufpos == buflen) return buffer; - jbyteArray result = JvNewByteArray(bufpos); - memcpy (elements (result), elements (buffer), bufpos); + jbyteArray result = JvNewByteArray(buflen); + memcpy (elements (result), elements (buffer), buflen); return result; } |