diff options
| author | Tom Tromey <tromey@cygnus.com> | 1999-04-21 11:49:39 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 1999-04-21 11:49:39 +0000 |
| commit | 47e2610954aa5a519ef984e2760e2a239ec70440 (patch) | |
| tree | ea495ba5926a151ef878bb522692413c8b7560a6 /libjava | |
| parent | 11bbe619e3cde61713677fa72d78bae973eb0c0f (diff) | |
| download | gcc-47e2610954aa5a519ef984e2760e2a239ec70440.zip gcc-47e2610954aa5a519ef984e2760e2a239ec70440.tar.gz gcc-47e2610954aa5a519ef984e2760e2a239ec70440.tar.bz2 | |
natString.cc (getBytes): Correctly size result buffer.
* java/lang/natString.cc (getBytes): Correctly size result
buffer. From Bryce McKinlay <bryce@albatross.co.nz>.
From-SVN: r26575
Diffstat (limited to 'libjava')
| -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 027819a..daba9ef 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 a598485..cbd36bb 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; } |