natString.cc (getBytes): Reverted earlier change and applied correct fix from Per...

	* java/lang/natString.cc (getBytes): Reverted earlier change and
	applied correct fix from Per Bothner.

From-SVN: r26579

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index b2b035418ce6e045fb640521d85eebc96155bcc8..da93b9cc83141e574cc71973d42ab6565c778f55 100644 (file)
--- 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 cbd36bb3f97fe22f1faf4d8f2125016d8368da5c..08f1755715dadaf7f90c3b913b441626a6a46e54 100644 (file)
--- 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;
 }