Pass proper fixed argument count

The fixedParameterTypes array will be one wider than the count of fixed arguments, since the final argument will be a Java vararg.
jnr · Jan 5, 2022 · e0bcc35 · e0bcc35
1 parent b5c1708
commit e0bcc35
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/main/java/jnr/ffi/provider/jffi/DefaultInvokerFactory.java b/src/main/java/jnr/ffi/provider/jffi/DefaultInvokerFactory.java
@@ -368,9 +368,10 @@ public final Object invoke(Object self, Object[] parameters) {
             variableArgs[variableArgsCount] = null;
             variableArgsCount++;
 
-            int totalArgsCount = variableArgsCount + fixedParameterTypes.length - 1;
+            int fixedParamCount = fixedParameterTypes.length - 1;
+            int totalArgsCount = variableArgsCount + fixedParamCount;
             Function function = new Function(functionAddress,
-                    getCallContext(resultType, fixedParameterTypes.length, argTypes, totalArgsCount, callingConvention, requiresErrno));
+                    getCallContext(resultType, fixedParamCount, argTypes, totalArgsCount, callingConvention, requiresErrno));
             HeapInvocationBuffer buffer = new HeapInvocationBuffer(function.getCallContext());
 
             InvocationSession session = new InvocationSession();
@@ -380,7 +381,7 @@ public final Object invoke(Object self, Object[] parameters) {
                 }
 
                 for (int i = 0; i < variableArgsCount; ++i) {
-                    getMarshaller(argTypes[i + fixedParameterTypes.length - 1]).marshal(session, buffer, variableArgs[i]);
+                    getMarshaller(argTypes[i + fixedParamCount]).marshal(session, buffer, variableArgs[i]);
                 }
 
                 return functionInvoker.invoke(runtime, function, buffer);