Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60844

Correctly handle the error when fewer parameter values than required by the method are used to invoke an EL method expression. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1788323 13f79535-47bb-0310-9956-ffa450edef68
apache · Mar 23, 2017 · 11af805 · 11af805
1 parent bc8db4d
commit 11af805
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/java/org/apache/el/util/ReflectionUtil.java b/java/org/apache/el/util/ReflectionUtil.java
@@ -184,7 +184,7 @@ public static Method getMethod(EvaluationContext ctx, Object base, Object proper
                         if (isAssignableFrom(paramTypes[j], varType)) {
                             assignableMatch++;
                         } else {
-                            if (paramValues == null) {
+                            if (paramValues == null || j >= paramValues.length) {
                                 noMatch = true;
                                 break;
                             } else {
@@ -203,7 +203,7 @@ public static Method getMethod(EvaluationContext ctx, Object base, Object proper
                 } else if (isAssignableFrom(paramTypes[i], mParamTypes[i])) {
                     assignableMatch++;
                 } else {
-                    if (paramValues == null) {
+                    if (paramValues == null || i >= paramValues.length) {
                         noMatch = true;
                         break;
                     } else {

diff --git a/test/org/apache/el/TestMethodExpressionImpl.java b/test/org/apache/el/TestMethodExpressionImpl.java
@@ -531,4 +531,11 @@ public void testBug57855e() {
         assertEquals("aaa, bbb", r.toString());
     }
 
+
+    @Test(expected=IllegalArgumentException.class)
+    public void testBug60844() {
+        MethodExpression me2 = factory.createMethodExpression(context,
+                "${beanC.sayHello}", null , new Class[]{ TesterBeanA.class, TesterBeanB.class});
+        me2.invoke(context, new Object[] { new Object() });
+    }
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
@@ -130,6 +130,15 @@
       </fix>
     </changelog>
   </subsection>
+  <subsection name="Jasper">
+    <changelog>
+      <fix>
+        <bug>60844</bug>: Correctly handle the error when fewer parameter values
+        than required by the method are used to invoke an EL method expression.
+        (markt)
+      </fix>
+    </changelog>
+  </subsection>
   <subsection name="jdbc-pool">
     <changelog>
       <fix>