commit 9af8755ec458552ad55adb2d106fd0915fd860e9
author Yi Kong <yikong@google.com> Tue Jan 19 16:08:16 2016 +0000
committer Yi Kong <yikong@google.com> Tue Jan 19 17:00:17 2016 +0000
tree 4154925914867fad86799740c7aab3a0599983fd
parent 69b3504330492426924a35148a696aa689d2b445

Do not remove leading dots during normalization by default

Bug: 26631749
Change-Id: I06e870c5f357fd7ffd4bc03af3b291daba5a4057

ojluni/src/main/java/java/net/URI.java

diff --git a/ojluni/src/main/java/java/net/URI.java b/ojluni/src/main/java/java/net/URI.java
index 7f156a7..b3dbaad 100755
--- a/ojluni/src/main/java/java/net/URI.java
+++ b/ojluni/src/main/java/java/net/URI.java
@@ -2036,7 +2036,7 @@
         }
 
         // 5.2 (6c-f)
-        String np = normalize(path);
+        String np = normalize(path, true);
 
         // 5.2 (6g): If the result is absolute but the path begins with "../",
         // then we simply leave the path as-is
@@ -2102,7 +2102,7 @@
                 // There is an additional step from RFC 3986 RI, requiring to remove dots for
                 // absolute path as well.
                 // http://b/25897693
-                ru.path = normalize(child.path);
+                ru.path = normalize(child.path, true);
             } else {
                 // 5.2 (6): Resolve relative path
                 ru.path = resolvePath(base.path, child.path, base.isAbsolute());
@@ -2355,7 +2355,7 @@
     // Remove "." segments from the given path, and remove segment pairs
     // consisting of a non-".." segment followed by a ".." segment.
     //
-    private static void removeDots(char[] path, int[] segs) {
+    private static void removeDots(char[] path, int[] segs, boolean removeLeading) {
         int ns = segs.length;
         int end = path.length - 1;
 
@@ -2402,7 +2402,7 @@
                         segs[i] = -1;
                         segs[j] = -1;
                     }
-                } else {
+                } else if (removeLeading) {
                     // This is a leading ".." segment. Per RFC 3986 RI, this should be removed as
                     // well. This fixes RFC 2396 "abnormal" examples.
                     // http://b/25897693
@@ -2455,6 +2455,10 @@
     // always retain trailing slashes.
     //
     private static String normalize(String ps) {
+        return normalize(ps, false);
+    }
+
+    private static String normalize(String ps, boolean removeLeading) {
 
         // Does this path need normalization?
         int ns = needsNormalization(ps);        // Number of segments
@@ -2469,7 +2473,7 @@
         split(path, segs);
 
         // Remove dots
-        removeDots(path, segs);
+        removeDots(path, segs, removeLeading);
 
         // Prevent scheme-name confusion
         maybeAddLeadingDot(path, segs);