commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1684309 - in /commons/proper/compress/trunk/src: changes/changes.xml main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
Date Tue, 09 Jun 2015 04:18:24 GMT
Author: bodewig
Date: Tue Jun  9 04:18:23 2015
New Revision: 1684309

URL: http://svn.apache.org/r1684309
Log:
COMPRESS-317 ArrayIndexOutOfBoundsException in ZipArchiveEntry#getMergedFields

Modified:
    commons/proper/compress/trunk/src/changes/changes.xml
    commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java

Modified: commons/proper/compress/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/changes/changes.xml?rev=1684309&r1=1684308&r2=1684309&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/changes/changes.xml (original)
+++ commons/proper/compress/trunk/src/changes/changes.xml Tue Jun  9 04:18:23 2015
@@ -54,8 +54,13 @@ breaks backwards compatibility for code
 This also changes the superclass of ZCompressorInputStream.    
 ">
 
+      <action issue="COMPRESS-317" type="fix" date="2015-06-09"
+              due-to="Lucas Werkmeister">
+        ArrayIndexOutOfBoundsException when ZIP extra fields are read
+        and the entry contains an UnparseableExtraField.
+      </action>
       <action issue="COMPRESS-316" type="add" date="2015-05-23"
-              due-to=""Nick Burch">
+              due-to="Nick Burch">
         CompressorStreamFactory can now auto-detect DEFLATE streams
         with ZLIB header.
       </action>

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java?rev=1684309&r1=1684308&r2=1684309&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
(original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
Tue Jun  9 04:18:23 2015
@@ -377,7 +377,7 @@ public class ZipArchiveEntry extends jav
 
     private ZipExtraField[] getMergedFields() {
         final ZipExtraField[] zipExtraFields = copyOf(extraFields, extraFields.length + 1);
-        zipExtraFields[zipExtraFields.length] = unparseableExtra;
+        zipExtraFields[extraFields.length] = unparseableExtra;
         return zipExtraFields;
     }
 



Mime
View raw message