From b8cbcc168f419873af1548c9799ccaa56f6eb63e Mon Sep 17 00:00:00 2001 From: Warren Levy Date: Fri, 8 Dec 2000 13:22:28 +0000 Subject: * java/lang/StringBuffer.java (insert(int,char[])): Avoid NullPointerException so proper check of offset can be done. --- ChangeLog | 5 +++++ java/lang/StringBuffer.java | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2e62dfe93..802326503 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-12-08 Warren Levy + + * java/lang/StringBuffer.java (insert(int,char[])): Avoid + NullPointerException so proper check of offset can be done. + 2000-12-05 Tom Tromey * 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 char[] argument into this -- cgit v1.2.1