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

gc.c: check arguments first

Browse source 
* gc.c (wmap_aset): check if both arguments are able to finalize
  before setting finalizers.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44108 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-12-10 05:17:19 +00:00
parent 9bd802f556
commit 0326725b24
2 changed files with 29 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
gc.c
View file

@ -1904,6 +1904,15 @@ should_be_callable(VALUE block)
rb_obj_classname(block));
}
}
static void
should_be_finalizable(VALUE obj)
{
rb_check_frozen(obj);
if (!FL_ABLE(obj)) {
rb_raise(rb_eArgError, "cannot define finalizer for %s",
rb_obj_classname(obj));
}
}
/*
* call-seq:
@ -1920,7 +1929,7 @@ define_final(int argc, VALUE *argv, VALUE os)
VALUE obj, block;
rb_scan_args(argc, argv, "11", &obj, &block);
rb_check_frozen(obj);
should_be_finalizable(obj);
if (argc == 1) {
block = rb_block_proc();
}
@ -1938,10 +1947,6 @@ define_final0(VALUE obj, VALUE block)
VALUE table;
st_data_t data;
if (!FL_ABLE(obj)) {
rb_raise(rb_eArgError, "cannot define finalizer for %s",
rb_obj_classname(obj));
}
RBASIC(obj)->flags |= FL_FINALIZE;
block = rb_ary_new3(2, INT2FIX(rb_safe_level()), block);
@ -1962,7 +1967,7 @@ define_final0(VALUE obj, VALUE block)
VALUE
rb_define_finalizer(VALUE obj, VALUE block)
{
rb_check_frozen(obj);
should_be_finalizable(obj);
should_be_callable(block);
return define_final0(obj, block);
}
@ -6479,8 +6484,10 @@ wmap_aset(VALUE self, VALUE wmap, VALUE orig)
struct weakmap *w;
TypedData_Get_Struct(self, struct weakmap, &weakmap_type, w);
rb_define_finalizer(orig, w->final);
rb_define_finalizer(wmap, w->final);
should_be_finalizable(orig);
should_be_finalizable(wmap);
define_final0(orig, w->final);
define_final0(wmap, w->final);
if (st_lookup(w->obj2wmap, (st_data_t)orig, &data)) {
rids = (VALUE)data;
}

14
test/ruby/test_weakmap.rb
View file

@ -14,6 +14,20 @@ class TestWeakMap < Test::Unit::TestCase
assert_not_same(x, @wm["FOO".downcase])
end
def test_aset_const
x = Object.new
assert_raise(ArgumentError) {@wm[true] = x}
assert_raise(ArgumentError) {@wm[false] = x}
assert_raise(ArgumentError) {@wm[nil] = x}
assert_raise(RuntimeError) {@wm[42] = x}
assert_raise(RuntimeError) {@wm[:foo] = x}
assert_raise(ArgumentError) {@wm[x] = true}
assert_raise(ArgumentError) {@wm[x] = false}
assert_raise(ArgumentError) {@wm[x] = nil}
assert_raise(RuntimeError) {@wm[x] = 42}
assert_raise(RuntimeError) {@wm[x] = :foo}
end
def test_include?
m = __callee__[/test_(.*)/, 1]
x = Object.new