#462 Append file separator to path check only if required

srikanth-lingala · Aug 30, 2022 · 0ffcaec · 0ffcaec
1 parent 5024127
commit 0ffcaec
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/net/lingala/zip4j/tasks/AbstractExtractFileTask.java b/src/main/java/net/lingala/zip4j/tasks/AbstractExtractFileTask.java
@@ -77,8 +77,12 @@ private void assertCanonicalPathsAreSame(File outputFile, String outputPath, Fil
  outputFileCanonicalPath = outputFileCanonicalPath + FILE_SEPARATOR;
  }
 
+ String outputCanonicalPath = (new File(outputPath).getCanonicalPath());
+ if (!outputCanonicalPath.endsWith(FILE_SEPARATOR)) {
+ outputCanonicalPath += FILE_SEPARATOR;
+ }
+
  // make sure no file is extracted outside the target directory (a.k.a. zip slip)
- String outputCanonicalPath = (new File(outputPath).getCanonicalPath()) + File.separator;
  if (!outputFileCanonicalPath.startsWith(outputCanonicalPath)) {
  throw new ZipException("illegal file name that breaks out of the target directory: "
  + fileHeader.getFileName());