(tomcat) branch 9.0.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 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


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

commit e4399dea35bb24daad7fc9f6a1c1fcb7fa84a04c
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 fd41025466..5d9d98aa9e 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -911,7 +911,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);
             }
         }
@@ -1123,7 +1123,7 @@ public abstract class WebappClassLoaderBase extends 
URLClassLoader
                 return stream;
             }
             // 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 4f24ae8c0d..11d3cda202 100644
--- a/test/org/apache/catalina/loader/TestWebappClassLoader.java
+++ b/test/org/apache/catalina/loader/TestWebappClassLoader.java
@@ -201,4 +201,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 0366ff7f97..1d653787d4 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