Use RARRAY_LENINT instead of casting

This ensures the int value range is not exceeded.
ffi · Apr 22, 2024 · 7d400a3 · 7d400a3
1 parent d006232
commit 7d400a3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/ext/ffi_c/FunctionInfo.c b/ext/ffi_c/FunctionInfo.c
@@ -183,7 +183,7 @@ fntype_initialize(int argc, VALUE* argv, VALUE self)
     Check_Type(rbParamTypes, T_ARRAY);
 
     TypedData_Get_Struct(self, FunctionType, &rbffi_fntype_data_type, fnInfo);
-    fnInfo->parameterCount = (int) RARRAY_LEN(rbParamTypes);
+    fnInfo->parameterCount = RARRAY_LENINT(rbParamTypes);
     fnInfo->parameterTypes = xcalloc(fnInfo->parameterCount, sizeof(*fnInfo->parameterTypes));
     fnInfo->ffiParameterTypes = xcalloc(fnInfo->parameterCount, sizeof(ffi_type *));
     fnInfo->nativeParameterTypes = xcalloc(fnInfo->parameterCount, sizeof(*fnInfo->nativeParameterTypes));

diff --git a/ext/ffi_c/StructLayout.c b/ext/ffi_c/StructLayout.c
@@ -487,7 +487,7 @@ struct_layout_initialize(VALUE self, VALUE fields, VALUE size, VALUE align)
     int i;
 
     TypedData_Get_Struct(self, StructLayout, &rbffi_struct_layout_data_type, layout);
-    layout->fieldCount = (int) RARRAY_LEN(fields);
+    layout->fieldCount = RARRAY_LENINT(fields);
     RB_OBJ_WRITE(self, &layout->rbFieldMap, rb_hash_new());
     RB_OBJ_WRITE(self, &layout->rbFieldNames, rb_ary_new2(layout->fieldCount));
     layout->size = (int) FFI_ALIGN(NUM2INT(size),  NUM2INT(align));

diff --git a/ext/ffi_c/Variadic.c b/ext/ffi_c/Variadic.c
@@ -211,7 +211,7 @@ variadic_invoke(VALUE self, VALUE parameterTypes, VALUE parameterValues)
     Check_Type(parameterValues, T_ARRAY);
 
     TypedData_Get_Struct(self, VariadicInvoker, &variadic_data_type, invoker);
-    paramCount = (int) RARRAY_LEN(parameterTypes);
+    paramCount = RARRAY_LENINT(parameterTypes);
     paramTypes = ALLOCA_N(Type *, paramCount);
     ffiParamTypes = ALLOCA_N(ffi_type *, paramCount);
     params = ALLOCA_N(FFIStorage, paramCount);