summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-04-15 00:46:00 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-04-15 00:46:00 +0000
commit8e64799c9614cf18541b04c66a46e0d081d39f57 (patch)
treeac5a3a807350d94d0dc8770109374b2f8a831032
parentf687a147ebd7ef029a9b95d599cebabbc04bbf1c (diff)
fix RSTRUCT_LEN macro in public C API
rb_struct_size returns an Integer VALUE, so it must be converted to a `long` for compatibility with previous Ruby C API versions. * ext/-test-/struct/len.c: new * test/-ext-/struct/test_len.rb: new * include/ruby/ruby.h (RSTRUCT_LEN): use NUM2LONG [ruby-core:80692] [Bug #13439] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58359 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ext/-test-/struct/len.c13
-rw-r--r--include/ruby/ruby.h2
-rw-r--r--test/-ext-/struct/test_len.rb10
3 files changed, 24 insertions, 1 deletions
diff --git a/ext/-test-/struct/len.c b/ext/-test-/struct/len.c
new file mode 100644
index 0000000..6153c72
--- /dev/null
+++ b/ext/-test-/struct/len.c
@@ -0,0 +1,13 @@
+#include "ruby.h"
+
+static VALUE
+bug_struct_len(VALUE obj)
+{
+ return LONG2NUM(RSTRUCT_LEN(obj));
+}
+
+void
+Init_len(VALUE klass)
+{
+ rb_define_method(klass, "rstruct_len", bug_struct_len, 0);
+}
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index 01ab9e5..9cf0b4c 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -1183,7 +1183,7 @@ void *rb_check_typeddata(VALUE, const rb_data_type_t *);
#define TypedData_Get_Struct(obj,type,data_type,sval) \
((sval) = (type*)rb_check_typeddata((obj), (data_type)))
-#define RSTRUCT_LEN(st) rb_struct_size(st)
+#define RSTRUCT_LEN(st) NUM2LONG(rb_struct_size(st))
#define RSTRUCT_PTR(st) rb_struct_ptr(st)
#define RSTRUCT_SET(st, idx, v) rb_struct_aset(st, INT2NUM(idx), (v))
#define RSTRUCT_GET(st, idx) rb_struct_aref(st, INT2NUM(idx))
diff --git a/test/-ext-/struct/test_len.rb b/test/-ext-/struct/test_len.rb
new file mode 100644
index 0000000..2358e34
--- /dev/null
+++ b/test/-ext-/struct/test_len.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: false
+require 'test/unit'
+require "-test-/struct"
+
+class Bug::Struct::Test_Len < Test::Unit::TestCase
+ def test_rstruct_len
+ klass = Bug::Struct.new(:a, :b, :c)
+ assert_equal 3, klass.new.rstruct_len
+ end
+end