[GR-18163] Check the argument is an array for FFI::Pointer#write_array_of_*.

PullRequest: truffleruby/1770

Author: eregon

src/main/ruby/truffleruby/core/truffle/ffi/pointer_access.rb

@@ -69,6 +69,7 @@ def read_array_of_char(length)
   alias_method :read_array_of_int8, :read_array_of_char
 
   def write_array_of_char(ary)
+    Truffle::Type.rb_check_type(ary, ::Array)
     ary.each_with_index do |value, i|
       Primitive.pointer_write_char address + (i * 1), Primitive.rb_to_int(value)
     end
@@ -119,6 +120,7 @@ def read_array_of_uchar(length)
   alias_method :read_array_of_uint8, :read_array_of_uchar
 
   def write_array_of_uchar(ary)
+    Truffle::Type.rb_check_type(ary, ::Array)
     ary.each_with_index do |value, i|
       Primitive.pointer_write_uchar address + (i * 1), Primitive.rb_to_int(value)
     end
@@ -169,6 +171,7 @@ def read_array_of_short(length)
   alias_method :read_array_of_int16, :read_array_of_short
 
   def write_array_of_short(ary)
+    Truffle::Type.rb_check_type(ary, ::Array)
     ary.each_with_index do |value, i|
       Primitive.pointer_write_short address + (i * 2), Primitive.rb_to_int(value)
     end
@@ -219,6 +222,7 @@ def read_array_of_ushort(length)
   alias_method :read_array_of_uint16, :read_array_of_ushort
 
   def write_array_of_ushort(ary)
+    Truffle::Type.rb_check_type(ary, ::Array)
     ary.each_with_index do |value, i|
       Primitive.pointer_write_ushort address + (i * 2), Primitive.rb_to_int(value)
     end
@@ -269,6 +273,7 @@ def read_array_of_int(length)
   alias_method :read_array_of_int32, :read_array_of_int
 
   def write_array_of_int(ary)
+    Truffle::Type.rb_check_type(ary, ::Array)
     ary.each_with_index do |value, i|
       Primitive.pointer_write_int address + (i * 4), Primitive.rb_to_int(value)
     end
@@ -319,6 +324,7 @@ def read_array_of_uint(length)
   alias_method :read_array_of_uint32, :read_array_of_uint
 
   def write_array_of_uint(ary)
+    Truffle::Type.rb_check_type(ary, ::Array)
     ary.each_with_index do |value, i|
       Primitive.pointer_write_uint address + (i * 4), Primitive.rb_to_int(value)
     end
@@ -374,6 +380,7 @@ def read_array_of_long(length)
   alias_method :read_array_of_long_long, :read_array_of_long
 
   def write_array_of_long(ary)
+    Truffle::Type.rb_check_type(ary, ::Array)
     ary.each_with_index do |value, i|
       Primitive.pointer_write_long address + (i * 8), Primitive.rb_to_int(value)
     end
@@ -432,6 +439,7 @@ def read_array_of_ulong(length)
   alias_method :read_array_of_ulong_long, :read_array_of_ulong
 
   def write_array_of_ulong(ary)
+    Truffle::Type.rb_check_type(ary, ::Array)
     ary.each_with_index do |value, i|
       Primitive.pointer_write_ulong address + (i * 8), Primitive.rb_to_int(value)
     end
@@ -485,6 +493,7 @@ def read_array_of_float(length)
   alias_method :read_array_of_float32, :read_array_of_float
 
   def write_array_of_float(ary)
+    Truffle::Type.rb_check_type(ary, ::Array)
     ary.each_with_index do |value, i|
       Primitive.pointer_write_float address + (i * 4), Truffle::Type.rb_to_f(value)
     end
@@ -535,6 +544,7 @@ def read_array_of_double(length)
   alias_method :read_array_of_float64, :read_array_of_double
 
   def write_array_of_double(ary)
+    Truffle::Type.rb_check_type(ary, ::Array)
     ary.each_with_index do |value, i|
       Primitive.pointer_write_double address + (i * 8), Truffle::Type.rb_to_f(value)
     end
@@ -594,6 +604,7 @@ def read_array_of_pointer(length)
   end
 
   def write_array_of_pointer(ary)
+    Truffle::Type.rb_check_type(ary, ::Array)
     ary.each_with_index do |value, i|
       Primitive.pointer_write_pointer address + (i * 8), get_pointer_value(value)
     end

src/main/ruby/truffleruby/core/type.rb

@@ -72,16 +72,12 @@ def self.check_funcall_callable(obj, name)
       Primitive.vm_method_lookup obj, name
     end
 
-    ##
     # Returns an object of given class. If given object already is one, it is
     # returned. Otherwise tries obj.meth and returns the result if it is of the
-    # right kind. TypeErrors are raised if the conversion method fails or the
+    # right kind. TypeError is raised if the conversion method fails or the
     # conversion result is wrong.
     #
-    # Uses Primitive.object_kind_of? to bypass type check overrides.
-    #
-    # Equivalent to MRI's rb_convert_type().
-
+    # Prefer the more correct #rb_convert_type.
     def self.coerce_to(obj, cls, meth)
       if Primitive.object_kind_of?(obj, cls)
         obj
@@ -266,6 +262,7 @@ def self.rb_convert_type(obj, cls, meth)
       end
     end
 
+    # MRI: Check_Type / rb_check_type
     def self.rb_check_type(obj, cls)
       unless Primitive.object_kind_of?(obj, cls)
         raise TypeError, "wrong argument type #{object_class(obj)} (expected #{cls})"

tool/generate-pointer-methods.rb

@@ -147,6 +147,7 @@ def read_array_of_#{type}(length)
 
     code << <<-RUBY
   def write_array_of_#{type}(ary)
+    Truffle::Type.rb_check_type(ary, ::Array)
     ary.each_with_index do |value, i|
       Primitive.pointer_write_#{type} address + (i * #{SIZEOF[base_type]}), #{transform.call('value')}
     end