diff options
| author | mark <mark@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-02-21 14:08:40 +0000 |
|---|---|---|
| committer | mark <mark@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-02-21 14:08:40 +0000 |
| commit | faf1abff03358d6f3c3b4c482c4ffe0d9df7ba49 (patch) | |
| tree | 963b29f780387ce1fd59fd1f5888b8489a979ebd | |
| parent | e736ae061c3d2631cd27a53d0de839ab17710a62 (diff) | |
| download | gcc-faf1abff03358d6f3c3b4c482c4ffe0d9df7ba49.tar.gz | |
* java/util/zip/ZipEntry.java (ZipEntry(String)): When name is bigger
then 65535 chars throw IllegalArgumentException.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@63222 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | 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,5 +1,10 @@ 2003-02-21 Mark Wielaard <mark@klomp.org> + * java/util/zip/ZipEntry.java (ZipEntry(String)): When name is bigger + then 65535 chars throw IllegalArgumentException. + +2003-02-21 Mark Wielaard <mark@klomp.org> + * java/util/zip/ZipFile.java (finalize): New method. 2003-02-21 Michael Koch <konqueror@gmx.de> 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; } |