merge revision(s) 47896: [Backport #10369]

* array.c (ary_recycle_hash): add RB_GC_GUARD
	  (rb_ary_diff): remove volatile
	  [Bug #10369]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47936 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2014-10-15 07:19:49 +00:00
parent 468854406c
commit 6e103e8412
3 changed files with 9 additions and 2 deletions

View file

@ -3781,6 +3781,7 @@ ary_recycle_hash(VALUE hash)
RHASH(hash)->ntbl = 0;
st_free_table(tbl);
}
RB_GC_GUARD(hash);
}
/*
@ -3804,7 +3805,7 @@ static VALUE
rb_ary_diff(VALUE ary1, VALUE ary2)
{
VALUE ary3;
volatile VALUE hash;
VALUE hash;
long i;
hash = ary_make_hash(to_ary(ary2));