commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject commons-compress git commit: COMPRESS-334 ArArchiveInputStream fails for BSD long names
Date Fri, 05 Feb 2016 17:33:04 GMT
Repository: commons-compress
Updated Branches:
  refs/heads/master 51eb0f22b -> 36335e3fa


COMPRESS-334 ArArchiveInputStream fails for BSD long names


Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/36335e3f
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/36335e3f
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/36335e3f

Branch: refs/heads/master
Commit: 36335e3face4b866c7bb88b39fa8a99959d0a907
Parents: 51eb0f2
Author: Stefan Bodewig <bodewig@apache.org>
Authored: Fri Feb 5 18:30:46 2016 +0100
Committer: Stefan Bodewig <bodewig@apache.org>
Committed: Fri Feb 5 18:32:48 2016 +0100

----------------------------------------------------------------------
 src/changes/changes.xml                                         | 5 +++++
 .../commons/compress/archivers/ar/ArArchiveInputStream.java     | 1 +
 2 files changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-compress/blob/36335e3f/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 80f49d0..a513026 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -44,6 +44,11 @@ The <action> type attribute can be add,update,fix,remove.
   <body>
     <release version="1.11" date="not released, yet"
              description="Release 1.11">
+      <action issue="COMPRESS-334" type="fix" date="2016-02-05"
+              due-to="Jeremy Gustie">
+        ArArchiveInputStream failed to read past the first entry when
+        BSD long names have been used.
+      </action>
       <action issue="COMPRESS-333" type="fix" date="2016-02-03" due-to="Dawid Weiss">
         Added buffering for random access which speeds up 7Z support.
       </action>

http://git-wip-us.apache.org/repos/asf/commons-compress/blob/36335e3f/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
b/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
index aeb3a15..99d90e3 100644
--- a/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
@@ -347,6 +347,7 @@ public class ArArchiveInputStream extends ArchiveInputStream {
         byte[] name = new byte[nameLen];
         int read = IOUtils.readFully(input, name);
         count(read);
+        offset += read > 0 ? read : 0;
         if (read != nameLen) {
             throw new EOFException();
         }


Mime
View raw message