diff options
| author | mark <mark@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-02-21 16:56:58 +0000 |
|---|---|---|
| committer | mark <mark@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-02-21 16:56:58 +0000 |
| commit | 28cda66b17a92205021042134cb99ea86230d099 (patch) | |
| tree | 26318ea52d80d9562109c7d00c57bac3e7821484 /libjava | |
| parent | 7f1a47100f1491a5811c66f76c1aa91cc76be6a9 (diff) | |
| download | ppe42-gcc-28cda66b17a92205021042134cb99ea86230d099.tar.gz ppe42-gcc-28cda66b17a92205021042134cb99ea86230d099.zip | |
* java/util/zip/ZipEntry.java (setComment): Don't check length when
argument is null.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@63227 138bc75d-0d04-0410-961f-82ee72b054a4
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; } |
