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;
 }