aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-06-19 14:36:17 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-06-19 14:36:17 +0000
commit828a51f20ebcc7d4e1db0e0dbfe80aa4c56fa71e (patch)
tree99b4e29261e713ca83ac5eafa8cdb0b49342f31c
parentfaea2f17389ce24386d51abfe1b50e1212829ad5 (diff)
downloadruby-828a51f20ebcc7d4e1db0e0dbfe80aa4c56fa71e.tar.gz
test for [Bug #12670]
heap corruption by deferred free. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59116 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ext/-test-/typeddata/typeddata.c24
-rw-r--r--test/-ext-/typeddata/test_typeddata.rb11
2 files changed, 35 insertions, 0 deletions
diff --git a/ext/-test-/typeddata/typeddata.c b/ext/-test-/typeddata/typeddata.c
index 1c5d677713..ae060960cd 100644
--- a/ext/-test-/typeddata/typeddata.c
+++ b/ext/-test-/typeddata/typeddata.c
@@ -2,19 +2,43 @@
static const rb_data_type_t test_data = {
"typed_data",
+ {NULL, ruby_xfree, NULL},
+ NULL, NULL,
+ 0/* deferred free */,
};
static VALUE
+test_alloc(VALUE klass)
+{
+ char *p;
+ return TypedData_Make_Struct(klass, char, &test_data, p);
+}
+
+static VALUE
test_check(VALUE self, VALUE obj)
{
rb_check_typeddata(obj, &test_data);
return obj;
}
+static VALUE
+test_make(VALUE klass, VALUE num)
+{
+ unsigned long i, n = NUM2UINT(num);
+
+ for (i = 0; i < n; i++) {
+ test_alloc(klass);
+ }
+
+ return Qnil;
+}
+
void
Init_typeddata(void)
{
VALUE mBug = rb_define_module("Bug");
VALUE klass = rb_define_class_under(mBug, "TypedData", rb_cData);
+ rb_define_alloc_func(klass, test_alloc);
rb_define_singleton_method(klass, "check", test_check, 1);
+ rb_define_singleton_method(klass, "make", test_make, 1);
}
diff --git a/test/-ext-/typeddata/test_typeddata.rb b/test/-ext-/typeddata/test_typeddata.rb
index daeda7611a..a8a7c965c9 100644
--- a/test/-ext-/typeddata/test_typeddata.rb
+++ b/test/-ext-/typeddata/test_typeddata.rb
@@ -17,4 +17,15 @@ class Test_TypedData < Test::Unit::TestCase
obj = eval("class C\u{1f5ff}; self; end").new
assert_raise_with_message(TypeError, /C\u{1f5ff}/) {Bug::TypedData.check(obj)}
end
+
+ def test_deferred_free
+ assert_ruby_status([], "#{<<-"begin;"}\n#{<<-"end;"}")
+ require "-test-/typeddata"
+ begin;
+ n = 1 << 20
+ Bug::TypedData.make(n)
+ end;
+ rescue MiniTest::Assertion => e
+ skip e.message
+ end
end