Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3E5D310813 for ; Wed, 27 Nov 2013 05:36:07 +0000 (UTC) Received: (qmail 1748 invoked by uid 500); 27 Nov 2013 05:36:02 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 1395 invoked by uid 500); 27 Nov 2013 05:35:58 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 1381 invoked by uid 99); 27 Nov 2013 05:35:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Nov 2013 05:35:56 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Nov 2013 05:35:48 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C80B32388999; Wed, 27 Nov 2013 05:35:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1545928 - in /commons/proper/compress/trunk/src: changes/changes.xml main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java Date: Wed, 27 Nov 2013 05:35:26 -0000 To: commits@commons.apache.org From: bodewig@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131127053526.C80B32388999@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bodewig Date: Wed Nov 27 05:35:26 2013 New Revision: 1545928 URL: http://svn.apache.org/r1545928 Log: COMPRESS-244 might overflow a 32bit int in SevenZFile#readUint64 - based on patch by Nico Kruber Modified: commons/proper/compress/trunk/src/changes/changes.xml commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.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=1545928&r1=1545927&r2=1545928&view=diff ============================================================================== --- commons/proper/compress/trunk/src/changes/changes.xml (original) +++ commons/proper/compress/trunk/src/changes/changes.xml Wed Nov 27 05:35:26 2013 @@ -48,6 +48,10 @@ The type attribute can be add,u SevenZOutputFile#closeArchiveEntry throws an exception when using LZMA2 compression on Java8. + + 7z reading of big 64bit values could be wrong. + Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java?rev=1545928&r1=1545927&r2=1545928&view=diff ============================================================================== --- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java (original) +++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java Wed Nov 27 05:35:26 2013 @@ -895,7 +895,7 @@ public class SevenZFile { } private static long readUint64(final DataInput in) throws IOException { - int firstByte = in.readUnsignedByte(); + long firstByte = in.readUnsignedByte(); int mask = 0x80; long value = 0; for (int i = 0; i < 8; i++) {