From 8a05f69f50b75665551dba50695e1dcf6b7d526c Mon Sep 17 00:00:00 2001
From: yut23 <yut23@gvljohnsons.com>
Date: Fri, 12 Nov 2021 01:39:55 -0500
Subject: [PATCH 1/2] Fix JavaMember varargs argument construction

---
 src/jse/org/luaj/vm2/lib/jse/JavaMember.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/jse/org/luaj/vm2/lib/jse/JavaMember.java b/src/jse/org/luaj/vm2/lib/jse/JavaMember.java
index e4e9b7ed..05cbebef 100644
--- a/src/jse/org/luaj/vm2/lib/jse/JavaMember.java
+++ b/src/jse/org/luaj/vm2/lib/jse/JavaMember.java
@@ -72,12 +72,15 @@ class JavaMember extends VarArgFunction {
 			for ( int i=0; i<a.length; i++ )
 				a[i] = fixedargs[i].coerce( args.arg(i+1) );
 		} else {
-			int n = Math.max(fixedargs.length,args.narg());
-			a = new Object[n];
+			// should be the fixed arguments, followed by an array with the varargs
+			a = new Object[fixedargs.length+1];
+			int nvar = Math.max(0, args.narg()-fixedargs.length);
+			Object[] vararray = new Object[nvar];
 			for ( int i=0; i<fixedargs.length; i++ )
 				a[i] = fixedargs[i].coerce( args.arg(i+1) );
-			for ( int i=fixedargs.length; i<n; i++ )
-				a[i] = varargs.coerce( args.arg(i+1) );
+			a[a.length-1] = vararray;
+			for ( int i=0; i<nvar; i++ )
+				vararray[i] = varargs.coerce( args.arg(fixedargs.length+i+1) );
 		}
 		return a;
 	}
-- 
2.49.1


From 42364df8be2d43e2624601a707bd9ec1c3aa9e39 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 17 Dec 2018 02:15:00 -0800
Subject: [PATCH 2/2] Fix bug with JavaMember Varargs invocation. Coerce the
 element type, not Array.

---
 src/jse/org/luaj/vm2/lib/jse/JavaMember.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jse/org/luaj/vm2/lib/jse/JavaMember.java b/src/jse/org/luaj/vm2/lib/jse/JavaMember.java
index 05cbebef..a65b182c 100644
--- a/src/jse/org/luaj/vm2/lib/jse/JavaMember.java
+++ b/src/jse/org/luaj/vm2/lib/jse/JavaMember.java
@@ -51,7 +51,7 @@ class JavaMember extends VarArgFunction {
 		fixedargs = new CoerceLuaToJava.Coercion[isvarargs? params.length-1: params.length];
 		for ( int i=0; i<fixedargs.length; i++ )
 			fixedargs[i] = CoerceLuaToJava.getCoercion( params[i] );
-		varargs = isvarargs? CoerceLuaToJava.getCoercion( params[params.length-1] ): null;
+		varargs = isvarargs? CoerceLuaToJava.getCoercion( params[params.length-1].getComponentType() ): null;
 	}
 	
 	int score(Varargs args) {
-- 
2.49.1