Merge branch '6.2' of https://github.com/lucee/Lucee into 6.2

# Conflicts: # loader/build.xml # loader/pom.xml
lucee · Dec 23, 2024 · 205e17c · 205e17c
2 parents bfa371c + 4073601
commit 205e17c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/core/src/main/java/lucee/commons/io/res/util/ResourceUtil.java b/core/src/main/java/lucee/commons/io/res/util/ResourceUtil.java
@@ -769,6 +769,9 @@ public static Resource getCanonicalResourceEL(Resource res) {
 		catch (IOException e) {
 			return res.getAbsoluteResource();
 		}
+		catch (java.nio.file.InvalidPathException ipe) {
+			return res.getAbsoluteResource();
+		}
 	}
 
 	public static String getNormalizedPathEL(Resource res) {
@@ -779,6 +782,9 @@ public static String getNormalizedPathEL(Resource res) {
 		catch (IOException e) {
 			return res.toString();
 		}
+		catch (java.nio.file.InvalidPathException ipe) {
+			return res.toString();
+		}
 	}
 
 	public static Resource getNormalizedResourceEL(Resource res) {
@@ -789,6 +795,9 @@ public static Resource getNormalizedResourceEL(Resource res) {
 		catch (IOException e) {
 			return res.getAbsoluteResource();
 		}
+		catch (java.nio.file.InvalidPathException ipe) {
+			return res.getAbsoluteResource();
+		}
 	}
 
 	public static File getCanonicalFileEL(File file) {

diff --git a/core/src/main/java/lucee/runtime/PageSourceImpl.java b/core/src/main/java/lucee/runtime/PageSourceImpl.java
@@ -966,7 +966,7 @@ public PageSource getRealPage(String realPath) {
 		else realPath = realPath.replace('\\', '/');
 		RefBoolean _isOutSide = new RefBooleanImpl(isOutSide);
 
-		if (realPath.indexOf('/') == 0) {
+		if (realPath.indexOf('/') == 0 || ResourceUtil.isWindowsPath(realPath)) {
 			_isOutSide.setValue(false);
 		}
 		else if (realPath.startsWith("./")) {
@@ -983,7 +983,7 @@ public Resource getRealResource(String realPath) {
 		else realPath = realPath.replace('\\', '/');
 		RefBoolean _isOutSide = new RefBooleanImpl(isOutSide);
 
-		if (realPath.indexOf('/') == 0) {
+		if (realPath.indexOf('/') == 0 || ResourceUtil.isWindowsPath(realPath)) {
 			_isOutSide.setValue(false);
 		}
 		else if (realPath.startsWith("./")) {

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.250-SNAPSHOT"/>
+  <property name="version" value="6.2.0.252-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.250-SNAPSHOT</version>
+  <version>6.2.0.252-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>

diff --git a/test/tickets/LDEV4602.cfc b/test/tickets/LDEV4602.cfc
@@ -1,4 +1,4 @@
-component extends = "org.lucee.cfml.test.LuceeTestCase" {
+component extends = "org.lucee.cfml.test.LuceeTestCase" skip=true{
 
 	function run( testResults, testBox ){
 		describe( "bytecode testing", function(){