diff options
| author | Tom Tromey <tromey@cygnus.com> | 1999-04-21 13:50:39 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 1999-04-21 13:50:39 +0000 |
| commit | baa288f308a8b1b86607995fe71258d7e3cc2825 (patch) | |
| tree | d5ee50159f44032acf2cf8931827e14bf35df694 /libjava | |
| parent | 5423609c57f756be5db8981d4ebb11a80d44f6e9 (diff) | |
| download | gcc-baa288f308a8b1b86607995fe71258d7e3cc2825.zip gcc-baa288f308a8b1b86607995fe71258d7e3cc2825.tar.gz gcc-baa288f308a8b1b86607995fe71258d7e3cc2825.tar.bz2 | |
natString.cc (getBytes): Reverted earlier change and applied correct fix from Per Bothner.
* java/lang/natString.cc (getBytes): Reverted earlier change and
applied correct fix from Per Bothner.
From-SVN: r26579
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 3 | ||||
| -rw-r--r-- | libjava/java/lang/natString.cc | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index b2b0354..da93b9c 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,8 @@ 1999-04-21 Tom Tromey <tromey@cygnus.com> + * java/lang/natString.cc (getBytes): Reverted earlier change and + applied correct fix from Per Bothner. + * java/lang/String.java: Don't throw UnsupportedEncodingException. diff --git a/libjava/java/lang/natString.cc b/libjava/java/lang/natString.cc index cbd36bb..08f1755 100644 --- a/libjava/java/lang/natString.cc +++ b/libjava/java/lang/natString.cc @@ -473,9 +473,11 @@ java::lang::String::getBytes (jstring enc) { converter->setOutput(buffer, bufpos); int converted = converter->write(this, offset, todo, NULL); + bufpos = converter->count; if (converted == 0) { - jbyteArray newbuffer = JvNewByteArray(2 * buflen); + buflen *= 2; + jbyteArray newbuffer = JvNewByteArray(buflen); memcpy (elements (newbuffer), elements (buffer), bufpos); buffer = newbuffer; } @@ -487,8 +489,8 @@ java::lang::String::getBytes (jstring enc) } if (bufpos == buflen) return buffer; - jbyteArray result = JvNewByteArray(buflen); - memcpy (elements (result), elements (buffer), buflen); + jbyteArray result = JvNewByteArray(bufpos); + memcpy (elements (result), elements (buffer), bufpos); return result; } |