Stash normalized path outside of loop

labkey-tchad · labkey-tchad · commit 8e00808303bc · 2025-10-02T15:06:56.000-07:00
diff --git a/src/org/labkey/test/TestFileUtils.java b/src/org/labkey/test/TestFileUtils.java
@@ -632,11 +632,13 @@ private static List<File> unTar(final File inputFile, final File outputDir) thro
              TarArchiveInputStream inputStream = new ArchiveStreamFactory().createArchiveInputStream("tar", is))
         {
             TarArchiveEntry entry;
+            Path normalizedOutputPath = outputDir.toPath().normalize();
+
             while ((entry = inputStream.getNextEntry()) != null)
             {
                 final File outputFile = new File(outputDir, entry.getName());
 
-                if (!outputFile.toPath().normalize().startsWith(outputDir.toPath()))
+                if (!outputFile.toPath().normalize().startsWith(normalizedOutputPath))
                     throw new IOException("Bad zip entry (" + entry.getName() + ") in " + inputFile.getAbsolutePath());
 
                 if (entry.isDirectory())

Original file line number	Diff line number	Diff line change
`@@ -632,11 +632,13 @@ private static List<File> unTar(final File inputFile, final File outputDir) thro`
`632`	`632`	`TarArchiveInputStream inputStream = new ArchiveStreamFactory().createArchiveInputStream("tar", is))`
`633`	`633`	`{`
`634`	`634`	`TarArchiveEntry entry;`
	`635`	`+ Path normalizedOutputPath = outputDir.toPath().normalize();`
	`636`	`+`
`635`	`637`	`while ((entry = inputStream.getNextEntry()) != null)`
`636`	`638`	`{`
`637`	`639`	`final File outputFile = new File(outputDir, entry.getName());`
`638`	`640`
`639`		`- if (!outputFile.toPath().normalize().startsWith(outputDir.toPath()))`
	`641`	`+ if (!outputFile.toPath().normalize().startsWith(normalizedOutputPath))`
`640`	`642`	`throw new IOException("Bad zip entry (" + entry.getName() + ") in " + inputFile.getAbsolutePath());`
`641`	`643`
`642`	`644`	`if (entry.isDirectory())`