mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-13 12:05:21 +02:00
Code Issues Wiki Activity

Bug 331005 - [archives] RSEF1301 when opening file in a ZIP archive containing backslash separators

Browse source
This commit is contained in:
Martin Oberhuber 2010-11-25 09:01:24 +00:00
parent ac3f274ca9
commit 2ac14ae969
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemZipHandler.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2003, 2008 IBM Corporation and others. * Copyright (c) 2003, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -24,6 +24,7 @@
* Xuan Chen (IBM) - [191370] [dstore] Supertransfer zip not deleted when canceling copy * Xuan Chen (IBM) - [191370] [dstore] Supertransfer zip not deleted when canceling copy
* Martin Oberhuber (Wind River) - [cleanup] Add API "since" tags * Martin Oberhuber (Wind River) - [cleanup] Add API "since" tags
* Martin Oberhuber (Wind River) - [199854][api] Improve error reporting for archive handlers * Martin Oberhuber (Wind River) - [199854][api] Improve error reporting for archive handlers
* Krzysztof Kosmatka - [331005] Error opening file from ZIP with \ separators
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.services.clientserver.archiveutils; package org.eclipse.rse.services.clientserver.archiveutils;
@ -2451,6 +2452,7 @@ public class SystemZipHandler implements ISystemArchiveHandler
{ {
ZipEntry entry = _zipfile.getEntry(name); ZipEntry entry = _zipfile.getEntry(name);
if (entry == null) entry = _zipfile.getEntry("/" + name); //$NON-NLS-1$ if (entry == null) entry = _zipfile.getEntry("/" + name); //$NON-NLS-1$
if (entry == null) entry = _zipfile.getEntry(name.replace('/', '\\')); // fixing bug 331005
if (entry == null) throw new IOException("SystemZipHandler.safeGetEntry(): The ZipEntry " + name + " cannot be found in " + _file.toString()); //$NON-NLS-1$ //$NON-NLS-2$ if (entry == null) throw new IOException("SystemZipHandler.safeGetEntry(): The ZipEntry " + name + " cannot be found in " + _file.toString()); //$NON-NLS-1$ //$NON-NLS-2$
return entry; return entry;
} }