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


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

commit 7e596c6949e3047a409926b9a9ab335fda4f5891
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Mar 31 16:57:12 2025 +0100

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

diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java 
b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index 2ccf9c7c18..67f79bc3d0 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -771,7 +771,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);
             }
         }
@@ -1019,7 +1019,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/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 13b76fc858..1110c801e8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -176,6 +176,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