From 3a3f137e0de6ea3acab06f1b4b16ada378caec2b Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Fri, 21 Feb 2003 16:56:58 +0000 Subject: [PATCH] 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 --- libjava/ChangeLog | 5 +++++ libjava/java/util/zip/ZipEntry.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c27bd8b5a0b..da27b23f0b9 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2003-02-21 Mark Wielaard + + * java/util/zip/ZipEntry.java (setComment): Don't check length when + argument is null. + 2003-02-21 Mark Wielaard * java/util/zip/ZipEntry.java (ZipEntry(String)): When name is bigger 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; }