(tomcat) branch 10.1.x updated: Fix StringIndexOutOfBoundsException on getResource("")

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.1.x by this push:
     new 4ce64099bc Fix StringIndexOutOfBoundsException on getResource("")
4ce64099bc is described below

commit 4ce64099bc5828ae9f6939e3befe31f0c5f6d174
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Mar 31 16:48:32 2025 +0100

    Fix StringIndexOutOfBoundsException on getResource("")
---
 .../org/apache/catalina/loader/WebappClassLoaderBase.java |  4 ++--
 .../org/apache/catalina/loader/TestWebappClassLoader.java | 15 +++++++++++++++
 webapps/docs/changelog.xml                                |  4 ++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java 
b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index 5469cf2c1a..70c47b75a4 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -901,7 +901,7 @@ public abstract class WebappClassLoaderBase extends 
URLClassLoader
             }
 
             // Skip caching results for invalid names (it might mask lookups 
for valid ones)
-            if (url == null && name.charAt(0) != '/') {
+            if (url == null && !name.isEmpty() && name.charAt(0) != '/') {
                 notFoundClassResources.add(path);
             }
         }
@@ -1149,7 +1149,7 @@ public abstract class WebappClassLoaderBase extends 
URLClassLoader
             }
 
             // Skip caching results for invalid names (it might mask lookups 
for valid ones)
-            if (name.charAt(0) != '/') {
+            if (!name.isEmpty() && name.charAt(0) != '/') {
                 notFoundClassResources.add(path);
             }
         }
diff --git a/test/org/apache/catalina/loader/TestWebappClassLoader.java 
b/test/org/apache/catalina/loader/TestWebappClassLoader.java
index 38daf81d63..3c51239cef 100644
--- a/test/org/apache/catalina/loader/TestWebappClassLoader.java
+++ b/test/org/apache/catalina/loader/TestWebappClassLoader.java
@@ -202,4 +202,19 @@ public class TestWebappClassLoader extends TomcatBaseTest {
         URL u2 = cl.getResource("jaspic-test-01.xml");
         Assert.assertNotNull(u2);
     }
+
+
+    @Test
+    public void testResourceNameEmptyString() throws Exception {
+        Tomcat tomcat = getTomcatInstance();
+        getProgrammaticRootContext();
+        tomcat.start();
+
+        // Add an external resource to the web application
+        WebappClassLoaderBase cl =
+                (WebappClassLoaderBase) ((Context) 
tomcat.getHost().findChildren()[0]).getLoader().getClassLoader();
+
+        URL u1 = cl.getResource("");
+        Assert.assertNotNull(u1);
+    }
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e9d74fb464..18b53e2075 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -166,6 +166,10 @@
         RewriteValve and document how <code>%nn</code> URL encoding may be used
         with rewrite rules. (markt)
       </fix>
+      <fix>
+        Fix a potential exception when calling
+        <code>WebappClassLoaderBase.getResource("")</code>. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org