[tomcat] branch 10.1.x updated: Avoid unlikely NPE

[remm]

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

remm 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 56ffda277d Avoid unlikely NPE
56ffda277d is described below

commit 56ffda277d3ee5192a8169168d2cd5c2d3a5200a
Author: remm <r...@apache.org>
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 b577a5e43f..1d93bbe452 100644
--- a/java/org/apache/tomcat/util/scan/StandardJarScanner.java
+++ b/java/org/apache/tomcat/util/scan/StandardJarScanner.java
@@ -192,8 +192,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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org