This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new d3787ec31c Avoid unlikely NPE
d3787ec31c is described below
commit d3787ec31c95203e0bfce6d2b343e84d7ff08b92
Author: remm <[email protected]>
AuthorDate: Wed Sep 20 10:21:14 2023 +0200
Avoid unlikely NPE
Really not supposed to happen after a directory listing, but it's still
best to do clean logging.
Found by coverity.
---
java/org/apache/tomcat/util/scan/StandardJarScanner.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/util/scan/StandardJarScanner.java
b/java/org/apache/tomcat/util/scan/StandardJarScanner.java
index cedeb6ca80..85c3c00614 100644
--- a/java/org/apache/tomcat/util/scan/StandardJarScanner.java
+++ b/java/org/apache/tomcat/util/scan/StandardJarScanner.java
@@ -193,8 +193,12 @@ public class StandardJarScanner implements JarScanner {
URL url = null;
try {
url = context.getResource(path);
- processedURLs.add(url);
- process(scanType, callback, url, path, true, null);
+ if (url != null) {
+ processedURLs.add(url);
+ process(scanType, callback, url, path, true, null);
+ } else {
+ log.warn(sm.getString("jarScan.webinflibFail",
path));
+ }
} catch (IOException e) {
log.warn(sm.getString("jarScan.webinflibFail", url),
e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
