detect uri pattern and not windows drives on File.dirname

enebo · Jun 17, 2015 · 0046bed · 0046bed
1 parent 85d972c
commit 0046bed
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/core/src/main/java/org/jruby/RubyFile.java b/core/src/main/java/org/jruby/RubyFile.java
@@ -661,6 +661,7 @@ public static IRubyObject dirname(ThreadContext context, IRubyObject recv, IRuby
         return runtime.newString(dirname(context, jfilename)).infectBy(filename);
     }
 
+    private static Pattern PROTOCOL_PATTERN = Pattern.compile("^[a-z:]{2,}:/");
     public static String dirname(ThreadContext context, String jfilename) {
         String name = jfilename.replace('\\', '/');
         int minPathLength = 1;
@@ -673,7 +674,7 @@ public static String dirname(ThreadContext context, String jfilename) {
         }
 
         // address all the url like paths first
-        if (name.contains(":/") || name.contains("!/")) {
+        if (PROTOCOL_PATTERN.matcher(name).matches() || name.contains("!/")) {
             int start = Math.max(name.indexOf(":/"), name.indexOf("!/")) + 2;
             String path = dirname(context, name.substring(start));
             if (path.equals(".") || path.equals("/")) path = "";