Author: henrib
Date: Sat Jan 20 11:55:55 2018
New Revision: 1821740

URL: http://svn.apache.org/viewvc?rev=1821740&view=rev
Log:
JEXL:
Protect against potential NPE

Modified:
    
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlArithmetic.java

Modified: 
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlArithmetic.java
URL: 
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlArithmetic.java?rev=1821740&r1=1821739&r2=1821740&view=diff
==============================================================================
--- 
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlArithmetic.java
 (original)
+++ 
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlArithmetic.java
 Sat Jan 20 11:55:55 2018
@@ -588,14 +588,16 @@ public class JexlArithmetic {
      */
     public boolean narrowArguments(Object[] args) {
         boolean narrowed = false;
-        for (int a = 0; a < args.length; ++a) {
-            Object arg = args[a];
-            if (arg instanceof Number) {
-                Number narg = (Number) arg;
-                Number narrow = narrow(narg);
-                if (!narg.equals(narrow)) {
-                    args[a] = narrow;
-                    narrowed = true;
+        if (args != null) {
+            for (int a = 0; a < args.length; ++a) {
+                Object arg = args[a];
+                if (arg instanceof Number) {
+                    Number narg = (Number) arg;
+                    Number narrow = narrow(narg);
+                    if (!narg.equals(narrow)) {
+                        args[a] = narrow;
+                        narrowed = true;
+                    }
                 }
             }
         }


Reply via email to