* java/lang/StringBuffer.java (insert(int,char[])): Avoid

	NullPointerException so proper check of offset can be done.

2 files changed, 8 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 2e62dfe93..802326503 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-08  Warren Levy  <warrenl@redhat.com>
+
+	* java/lang/StringBuffer.java (insert(int,char[])): Avoid
+	NullPointerException so proper check of offset can be done.
+
 2000-12-05  Tom Tromey  <tromey@redhat.com>
 
 	* java/util/BitSet.java: Class no longer final.
diff --git a/java/lang/StringBuffer.java b/java/lang/StringBuffer.java
index 3ce5d0d32..a8ee2d9c2 100644
--- a/java/lang/StringBuffer.java
+++ b/java/lang/StringBuffer.java
@@ -470,7 +470,9 @@ public final class StringBuffer implements Serializable
    */
   public StringBuffer insert (int offset, char[] data)
   {
-    return insert (offset, data, 0, data.length);
+    // One could check if offset is invalid here instead of making sure that
+    // data isn't null before dereferencing, but this works just as well.
+    return insert (offset, data, 0, data == null ? 0 : data.length);
   }
 
   /** Insert the <code>char[]</code> argument into this