From 7b54048202a63c12b4b8ee15c39c3d231791f0a0 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Fri, 21 Feb 2003 14:08:40 +0000 Subject: [PATCH] ZipEntry.java (ZipEntry(String)): When name is bigger then 65535 chars throw IllegalArgumentException. * java/util/zip/ZipEntry.java (ZipEntry(String)): When name is bigger then 65535 chars throw IllegalArgumentException. From-SVN: r63222 --- libjava/ChangeLog | 5 +++++ libjava/java/util/zip/ZipEntry.java | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 2663795eed5..c27bd8b5a0b 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2003-02-21 Mark Wielaard + + * java/util/zip/ZipEntry.java (ZipEntry(String)): When name is bigger + then 65535 chars throw IllegalArgumentException. + 2003-02-21 Mark Wielaard * java/util/zip/ZipFile.java (finalize): New method. diff --git a/libjava/java/util/zip/ZipEntry.java b/libjava/java/util/zip/ZipEntry.java index c9f1b1d7d44..b70585049dc 100644 --- a/libjava/java/util/zip/ZipEntry.java +++ b/libjava/java/util/zip/ZipEntry.java @@ -84,11 +84,15 @@ public class ZipEntry implements ZipConstants, Cloneable * Creates a zip entry with the given name. * @param name the name. May include directory components separated * by '/'. + * + * @exception NullPointerException when name is null. + * @exception IllegalArgumentException when name is bigger then 65535 chars. */ public ZipEntry(String name) { - if (name == null) - throw new NullPointerException(); + int length = name.length(); + if (length > 65535) + throw new IllegalArgumentException("name length is " + length); this.name = name; }