Repository: ant Updated Branches: refs/heads/master e9d4c9ae8 -> 6e34f177e
COMPRESS-317 ArrayIndexOutOfBoundsException in ZipArchiveEntry#getMergedFields Too bad this hasn't been found two weeks before. Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/6e34f177 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/6e34f177 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/6e34f177 Branch: refs/heads/master Commit: 6e34f177ee9e41ba3d066b6a4c92b21dbdf28804 Parents: e9d4c9a Author: Stefan Bodewig <[email protected]> Authored: Tue Jun 9 06:22:27 2015 +0200 Committer: Stefan Bodewig <[email protected]> Committed: Tue Jun 9 06:22:27 2015 +0200 ---------------------------------------------------------------------- CONTRIBUTORS | 1 + WHATSNEW | 4 ++++ contributors.xml | 4 ++++ src/main/org/apache/tools/zip/ZipEntry.java | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/6e34f177/CONTRIBUTORS ---------------------------------------------------------------------- diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 0a0d0fb..e78bd62 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -214,6 +214,7 @@ Larry Streepy Les Hughes Levi Cook lucas +Lucas Werkmeister Ludovic Claude Maarten Coene Magesh Umasankar http://git-wip-us.apache.org/repos/asf/ant/blob/6e34f177/WHATSNEW ---------------------------------------------------------------------- diff --git a/WHATSNEW b/WHATSNEW index 0cacc73..6db5548 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -7,6 +7,10 @@ Changes that could break older environments: Fixed bugs: ----------- + * ArrayIndexOutOfBoundsException when ZIP extra fields are read and + the entry contains an UnparseableExtraField. + https://issues.apache.org/jira/browse/COMPRESS-317 + Other changes: -------------- http://git-wip-us.apache.org/repos/asf/ant/blob/6e34f177/contributors.xml ---------------------------------------------------------------------- diff --git a/contributors.xml b/contributors.xml index d7c7162..7ea115e 100644 --- a/contributors.xml +++ b/contributors.xml @@ -883,6 +883,10 @@ <last>lucas</last> </name> <name> + <first>Lucas</first> + <last>Werkmeister</last> + </name> + <name> <first>Ludovic</first> <last>Claude</last> </name> http://git-wip-us.apache.org/repos/asf/ant/blob/6e34f177/src/main/org/apache/tools/zip/ZipEntry.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/zip/ZipEntry.java b/src/main/org/apache/tools/zip/ZipEntry.java index f66baf2..30a8155 100644 --- a/src/main/org/apache/tools/zip/ZipEntry.java +++ b/src/main/org/apache/tools/zip/ZipEntry.java @@ -361,7 +361,7 @@ public class ZipEntry extends java.util.zip.ZipEntry implements Cloneable { private ZipExtraField[] getMergedFields() { final ZipExtraField[] zipExtraFields = copyOf(extraFields, extraFields.length + 1); - zipExtraFields[zipExtraFields.length] = unparseableExtra; + zipExtraFields[extraFields.length] = unparseableExtra; return zipExtraFields; }
