Mailing-List: contact dev-help@commons.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "Commons Developers List" <dev@commons.apache.org>
Received-SPF: pass (nike.apache.org: domain of sebbaz@gmail.com designates
 209.85.214.171 as permitted sender)
Received-SPF: pass (google.com: domain of sebbaz@gmail.com designates
 10.182.15.70 as permitted sender) client-ip=10.182.15.70;
MIME-Version: 1.0
In-Reply-To: <20120228050027.935F42388A32@eris.apache.org>
References: <20120228050027.935F42388A32@eris.apache.org>
Date: Tue, 28 Feb 2012 13:35:31 +0000
Message-ID: 
 <CAOGo0VafX-N+zH_oXL_vvQA4--WJePDKzLU-65tmxHAs-_HMOQ@mail.gmail.com>
Subject: Re: svn commit: r1294460 - in /commons/proper/compress/trunk/src:
 changes/ main/java/org/apache/commons/compress/archivers/zip/
 test/java/org/apache/commons/compress/archivers/zip/ test/resources/
From: sebb <sebbaz@gmail.com>
To: dev@commons.apache.org
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

On 28 February 2012 05:00,  <bodewig@apache.org> wrote:
> Author: bodewig
> Date: Tue Feb 28 05:00:26 2012
> New Revision: 1294460
>
> URL: http://svn.apache.org/viewvc?rev=3D1294460&view=3Drev
> Log:
> add workaround for broken implementations that use backslashes rather tha=
n slashes in file names. =A0COMPRESS-176
>
> Added:
> =A0 =A0commons/proper/compress/trunk/src/test/java/org/apache/commons/com=
press/archivers/zip/ZipArchiveInputStreamTest.java =A0 (with props)
> =A0 =A0commons/proper/compress/trunk/src/test/resources/test-winzip.zip =
=A0 (with props)
> Modified:
> =A0 =A0commons/proper/compress/trunk/src/changes/changes.xml
> =A0 =A0commons/proper/compress/trunk/src/main/java/org/apache/commons/com=
press/archivers/zip/ZipArchiveEntry.java
> =A0 =A0commons/proper/compress/trunk/src/test/java/org/apache/commons/com=
press/archivers/zip/ZipFileTest.java
>
> Modified: commons/proper/compress/trunk/src/changes/changes.xml
> URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/chang=
es/changes.xml?rev=3D1294460&r1=3D1294459&r2=3D1294460&view=3Ddiff
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- commons/proper/compress/trunk/src/changes/changes.xml (original)
> +++ commons/proper/compress/trunk/src/changes/changes.xml Tue Feb 28 05:0=
0:26 2012
> @@ -46,6 +46,10 @@ The <action> type attribute can be add,u
> =A0 <body>
> =A0 =A0 <release version=3D"1.4" date=3D"unreleased"
> =A0 =A0 =A0 =A0 =A0 =A0 =A0description=3D"Release 1.4">
> + =A0 =A0 =A0<action issue=3D"COMPRESS-176" type=3D"update" date=3D"2012-=
02-28">
> + =A0 =A0 =A0 =A0Added a workaround for a Bug in WinZIP which uses backsl=
ashes
> + =A0 =A0 =A0 =A0as path separators in Unicode Extra Fields.
> + =A0 =A0 =A0</action>
> =A0 =A0 =A0 <action issue=3D"COMPRESS-131" type=3D"update" date=3D"2012-0=
2-23">
> =A0 =A0 =A0 =A0 ArrayOutOfBounds while decompressing bz2. Added test case=
 - code already seems to have been fixed.
> =A0 =A0 =A0 </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=3D1=
294460&r1=3D1294459&r2=3D1294460&view=3Ddiff
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- commons/proper/compress/trunk/src/main/java/org/apache/commons/compre=
ss/archivers/zip/ZipArchiveEntry.java (original)
> +++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compre=
ss/archivers/zip/ZipArchiveEntry.java Tue Feb 28 05:00:26 2012
> @@ -509,6 +509,10 @@ public class ZipArchiveEntry extends jav
> =A0 =A0 =A0* @param name the name to use
> =A0 =A0 =A0*/
> =A0 =A0 protected void setName(String name) {
> + =A0 =A0 =A0 =A0if (name !=3D null && getPlatform() =3D=3D PLATFORM_FAT
> + =A0 =A0 =A0 =A0 =A0 =A0&& name.indexOf("/") =3D=3D -1) {
> + =A0 =A0 =A0 =A0 =A0 =A0name =3D name.replace('\\', '/');
> + =A0 =A0 =A0 =A0}
> =A0 =A0 =A0 =A0 this.name =3D name;
> =A0 =A0 }

The original problem is with unicode extra fields only.

Would it not be safer to apply the fix to the method
setNameAndCommentFromExtraFields where it actually calls setName?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org