8360028: (fs) Path.relativize throws StringIndexOutOfBoundsException (win)

Brian Burkhalter · Brian Burkhalter · commit 2d9f0324ba21 · 2025-07-03T18:53:59.000Z
Reviewed-by: alanb
diff --git a/src/java.base/windows/classes/sun/nio/fs/WindowsLinkSupport.java b/src/java.base/windows/classes/sun/nio/fs/WindowsLinkSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -356,7 +356,9 @@ private static String readLinkImpl(WindowsPath path, long handle)
             if (target.isEmpty()) {
                 throw new IOException("Symbolic link target is invalid");
             }
-            return target;
+
+            // return normalized path string
+            return WindowsPathParser.parse(target).path();
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* This code is free software; you can redistribute it and/or modify it`
`@@ -356,7 +356,9 @@ private static String readLinkImpl(WindowsPath path, long handle)`
`356`	`356`	`if (target.isEmpty()) {`
`357`	`357`	`throw new IOException("Symbolic link target is invalid");`
`358`	`358`	`}`
`359`		`- return target;`
	`359`	`+`
	`360`	`+ // return normalized path string`
	`361`	`+ return WindowsPathParser.parse(target).path();`
`360`	`362`	`}`
`361`	`363`	`}`
`362`	`364`