This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new e39e5e886f Avoid possible NPE
e39e5e886f is described below
commit e39e5e886fdec04e6b96549edeffc51dc0a54d31
Author: remm <r...@apache.org>
AuthorDate: Thu Sep 14 11:27:51 2023 +0200
Avoid possible NPE
Found by coverity.
---
java/org/apache/catalina/webresources/AbstractFileResourceSet.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
b/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
index 6d7961c956..7a81b943b0 100644
--- a/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
+++ b/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
@@ -107,7 +107,7 @@ public abstract class AbstractFileResourceSet extends
AbstractResourceSet {
// absoluteBase has been normalized so absPath needs to be normalized
as
// well.
String absPath = normalize(file.getAbsolutePath());
- if (absoluteBase.length() > absPath.length()) {
+ if (absPath == null || absoluteBase.length() > absPath.length()) {
return null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
