diff options
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/lang/StringBuffer.java | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 91f20e7..9d5f97e 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 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-08 Warren Levy <warrenl@redhat.com> + * java/io/FileInputStream.java (close): Check if the fd is valid. * java/io/RandomAccessFile.java (close): Ditto. * java/net/PlainDatagramSocketImpl.java (close): Ditto. diff --git a/libjava/java/lang/StringBuffer.java b/libjava/java/lang/StringBuffer.java index 6e00fa7..0455ca6 100644 --- a/libjava/java/lang/StringBuffer.java +++ b/libjava/java/lang/StringBuffer.java @@ -454,7 +454,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 |