diff options
| author | Mark Wielaard <mark@klomp.org> | 2003-02-21 16:56:58 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@gcc.gnu.org> | 2003-02-21 16:56:58 +0000 |
| commit | 3a3f137e0de6ea3acab06f1b4b16ada378caec2b (patch) | |
| tree | 26318ea52d80d9562109c7d00c57bac3e7821484 /libjava | |
| parent | 7fb1c86d07111ef6c504d09f3b2a8936449bca11 (diff) | |
| download | gcc-3a3f137e0de6ea3acab06f1b4b16ada378caec2b.tar.gz gcc-3a3f137e0de6ea3acab06f1b4b16ada378caec2b.tar.bz2 gcc-3a3f137e0de6ea3acab06f1b4b16ada378caec2b.zip | |
ZipEntry.java (setComment): Don't check length when argument is null.
* java/util/zip/ZipEntry.java (setComment): Don't check length when
argument is null.
From-SVN: r63227
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/util/zip/ZipEntry.java | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c27bd8b5a0b..da27b23f0b9 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 2003-02-21 Mark Wielaard <mark@klomp.org> + * java/util/zip/ZipEntry.java (setComment): Don't check length when + argument is null. + +2003-02-21 Mark Wielaard <mark@klomp.org> + * java/util/zip/ZipEntry.java (ZipEntry(String)): When name is bigger then 65535 chars throw IllegalArgumentException. diff --git a/libjava/java/util/zip/ZipEntry.java b/libjava/java/util/zip/ZipEntry.java index b70585049dc..5284d793f6c 100644 --- a/libjava/java/util/zip/ZipEntry.java +++ b/libjava/java/util/zip/ZipEntry.java @@ -369,7 +369,7 @@ public class ZipEntry implements ZipConstants, Cloneable */ public void setComment(String comment) { - if (comment.length() > 0xffff) + if (comment != null && comment.length() > 0xffff) throw new IllegalArgumentException(); this.comment = comment; } |