[FIXED JENKINS-18970] Escape File.separator when used in a regex.

jenkinsci · Aug 3, 2013 · 378acf0 · 378acf0
1 parent eaa2afe
commit 378acf0
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/main/java/hudson/plugins/android_emulator/util/Utils.java b/src/main/java/hudson/plugins/android_emulator/util/Utils.java
@@ -604,18 +604,20 @@ public static String getRelativePath(String from, String to) {
         if (fromPath.equals(toPath)) {
             return "";
         }
-
         // Target directory is a subdirectory
         if (toPath.startsWith(fromPath)) {
             int fromLength = fromPath.length();
             int index = fromLength == 1 ? 1 : fromLength + 1;
             return toPath.substring(index) + File.separatorChar;
         }
 
+        // Quote separator, as String.split() takes a regex and
+        // File.separator isn't a valid regex character on Windows
+        final String separator = Pattern.quote(File.separator);
         // Target directory is somewhere above our directory
-        String[] fromParts = fromPath.substring(1).split(File.separator);
+        String[] fromParts = fromPath.substring(1).split(separator);
         final int fromLength = fromParts.length;
-        String[] toParts = toPath.substring(1).split(File.separator);
+        String[] toParts = toPath.substring(1).split(separator);
         final int toLength = toParts.length;
 
         // Find the number of common path segments