kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 58359: [Backport #13439]

Browse source 
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
This commit is contained in:
nagachika 2017-05-09 15:30:19 +00:00
parent 72fcda8be9
commit 2d909ca11f
4 changed files with 25 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ext/-test-/struct/len.c Normal file
View file

@ -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);
}

2
include/ruby/ruby.h
View file

@ -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))

10
test/-ext-/struct/test_len.rb Normal file
View file

@ -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

2
version.h
View file

@ -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