[tomcat] branch 10.1.x updated: Avoid possible 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 b7283659fa Avoid possible NPE
b7283659fa is described below

commit b7283659fa6f0b827ac8092bab458ba83a0b8f82
Author: remm <r...@apache.org>
AuthorDate: Wed Sep 20 14:35:27 2023 +0200

    Avoid possible NPE
    
    Found by coverity.
---
 java/org/apache/jasper/el/JasperELResolver.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/java/org/apache/jasper/el/JasperELResolver.java 
b/java/org/apache/jasper/el/JasperELResolver.java
index d24bfebee0..1a1bcfca3f 100644
--- a/java/org/apache/jasper/el/JasperELResolver.java
+++ b/java/org/apache/jasper/el/JasperELResolver.java
@@ -198,6 +198,9 @@ public class JasperELResolver extends CompositeELResolver {
         @Override
         public Object getValue(ELContext context, Object base,
                 Object property) {
+            if (base == null || property == null) {
+                return null;
+            }
             Object value = null;
             Method method = getReadMethod(base.getClass(), 
property.toString());
             if (method != null) {


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org