MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-CR-32661 throw exception instead of log.error

Browse Source
This commit is contained in:
Vladimir Krivosheev
2018-05-17 10:47:44 +02:00
parent 3a8057e248
commit 88a3ab8a3e
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/util/src/com/intellij/util/io/ZipUtil.java
+5 -8
View File
@@ -150,21 +150,20 @@ public class ZipUtil {
while (entries.hasMoreElements()) {
ZipEntry entry = (ZipEntry)entries.nextElement();
final File file = createFileForEntry(outputDir, entry);
if (file != null && (filenameFilter == null || filenameFilter.accept(file.getParentFile(), file.getName()))) {
if (filenameFilter == null || filenameFilter.accept(file.getParentFile(), file.getName())) {
doExtractEntry(entry, zipFile.getInputStream(entry), file, overwrite);
}
}
}
@Nullable
private static File createFileForEntry(@NotNull File outputDir, @NotNull ZipEntry entry) {
@NotNull
private static File createFileForEntry(@NotNull File outputDir, @NotNull ZipEntry entry) throws IOException {
String name = entry.getName();
File result = new File(outputDir, name);
// we cannot use Path, but File doesn't provide Path.normalize,
// so, our FileUtil.toCanonicalPath is used to normalized (isAncestor uses it under the hood)
if (name.contains("..") && !FileUtil.isAncestor(outputDir, result, true)) {
LOG.warn("Skip invalid entry: " + name);
return null;
throw new IOException("Invalid entry name: " + name);
}
return result;
}
@@ -175,9 +174,7 @@ public class ZipUtil {
public static void extractEntry(@NotNull ZipEntry entry, @NotNull InputStream inputStream, @NotNull File outputDir, boolean isOverwrite) throws IOException {
File outputFile = createFileForEntry(outputDir, entry);
if (outputFile != null) {
doExtractEntry(entry, inputStream, outputFile, isOverwrite);
}
doExtractEntry(entry, inputStream, outputFile, isOverwrite);
}
private static void doExtractEntry(@NotNull ZipEntry entry, @NotNull InputStream inputStream, @NotNull File outputFile, boolean isOverwrite) throws IOException {