LDEV-3328 avoid creating invalid windows path

lucee · Dec 23, 2024 · 89f0905 · 89f0905
1 parent 205e17c
commit 89f0905
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/core/src/main/java/lucee/runtime/MappingImpl.java b/core/src/main/java/lucee/runtime/MappingImpl.java
@@ -38,6 +38,7 @@
 import lucee.commons.io.log.Log;
 import lucee.commons.io.log.LogUtil;
 import lucee.commons.io.res.Resource;
+import lucee.commons.io.res.util.ResourceUtil;
 import lucee.commons.lang.ClassUtil;
 import lucee.commons.lang.ExceptionUtil;
 import lucee.commons.lang.MappingUtil;
@@ -448,7 +449,7 @@ public PageSource getPageSource(String realPath) {
 			else if (realPath.startsWith("./")) {
 				realPath = realPath.substring(1);
 			}
-			else {
+			else if (!ResourceUtil.isWindowsPath(realPath)){
 				realPath = "/" + realPath;
 			}
 		}
@@ -466,7 +467,7 @@ public Resource getResource(String realPath) {
 			else if (realPath.startsWith("./")) {
 				realPath = realPath.substring(1);
 			}
-			else {
+			else if (!ResourceUtil.isWindowsPath(realPath)){
 				realPath = "/" + realPath;
 			}
 		}

diff --git a/loader/build.xml b/loader/build.xml
@@ -2,7 +2,7 @@
 <project default="core" basedir="." name="Lucee" 
   xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
-  <property name="version" value="6.2.0.252-SNAPSHOT"/>
+  <property name="version" value="6.2.0.253-SNAPSHOT"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>

diff --git a/loader/pom.xml b/loader/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>6.2.0.252-SNAPSHOT</version>
+  <version>6.2.0.253-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>