diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-09 15:30:19 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-09 15:30:19 +0000 |
| commit | 2d909ca11f2d61171a9afca3ccca7e07db1e4527 (patch) | |
| tree | cb1df210e3511ae0d756ca4c029846c4e2fb060d | |
| parent | 72fcda8be921e9ccb2defaa07d6a0124e7af5628 (diff) | |
merge revision(s) 58359: [Backport #13439]
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/branches/ruby_2_4@58636 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ext/-test-/struct/len.c | 13 | ||||
| -rw-r--r-- | include/ruby/ruby.h | 2 | ||||
| -rw-r--r-- | test/-ext-/struct/test_len.rb | 10 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 25 insertions, 2 deletions
diff --git a/ext/-test-/struct/len.c b/ext/-test-/struct/len.c new file mode 100644 index 0000000000..6153c720b2 --- /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 4aa388849b..1491f24ecb 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -1190,7 +1190,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 0000000000..2358e340e5 --- /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 @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.4.2" #define RUBY_RELEASE_DATE "2017-05-10" -#define RUBY_PATCHLEVEL 129 +#define RUBY_PATCHLEVEL 130 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 5 |