take symlinks into account when expanding archives and checking entries

apache · Jul 1, 2018 · 5a8c37b · 5a8c37b
1 parent 6a41d62
commit 5a8c37b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/org/apache/tools/ant/taskdefs/Expand.java b/src/main/org/apache/tools/ant/taskdefs/Expand.java
@@ -333,9 +333,9 @@ protected void extractFile(FileUtils fileUtils, File srcF, File dir,
             mappedNames = new String[] {entryName};
         }
         File f = fileUtils.resolveFile(dir, mappedNames[0]);
-        if (!allowedOutsideOfDest && !fileUtils.isLeadingPath(dir, f)) {
-            log("skipping " + entryName + " as its target " + f + " is outside of "
-                + dir + ".", Project.MSG_VERBOSE);
+        if (!allowedOutsideOfDest && !fileUtils.isLeadingPath(dir, f, true)) {
+            log("skipping " + entryName + " as its target " + f.getCanonicalPath()
+                + " is outside of " + dir.getCanonicalPath() + ".", Project.MSG_VERBOSE);
                 return;
         }