diff options
| author | warrenl <warrenl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-12-08 13:08:36 +0000 |
|---|---|---|
| committer | warrenl <warrenl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-12-08 13:08:36 +0000 |
| commit | 9eb8671c4fa0a65b57c4c66e5c41c565e8b0c314 (patch) | |
| tree | 3a2f8a23af4be514e52fcf00e0ee9328dc47fb03 /libjava | |
| parent | 5020b43c6aa9f0f5a953b4b621df6f91508f36a8 (diff) | |
| download | ppe42-gcc-9eb8671c4fa0a65b57c4c66e5c41c565e8b0c314.tar.gz ppe42-gcc-9eb8671c4fa0a65b57c4c66e5c41c565e8b0c314.zip | |
* java/lang/StringBuffer.java (insert(int,char[])): Avoid
NullPointerException so proper check of offset can be done.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@38132 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -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 91f20e77135..9d5f97ebe1e 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 6e00fa7eba0..0455ca66c24 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 |
