From b5296022863787b9bc9ce161cf1e02d381d0b722 Mon Sep 17 00:00:00 2001 From: yugui Date: Fri, 18 Feb 2011 10:43:41 +0000 Subject: merges r30683 and r30684 from trunk into ruby_1_9_2. -- * hash.c (rb_hash_fetch_m): add GC guard to prevent intermediate variable from GC. -- * re.c (rb_reg_raise): add GC guard to prevent intermediate variable from GC. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30899 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- hash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hash.c') diff --git a/hash.c b/hash.c index 7774aacc53..0aa433d3cb 100644 --- a/hash.c +++ b/hash.c @@ -570,7 +570,7 @@ rb_hash_fetch_m(int argc, VALUE *argv, VALUE hash) if (!RHASH(hash)->ntbl || !st_lookup(RHASH(hash)->ntbl, key, &val)) { if (block_given) return rb_yield(key); if (argc == 1) { - VALUE desc = rb_protect(rb_inspect, key, 0); + volatile VALUE desc = rb_protect(rb_inspect, key, 0); if (NIL_P(desc) || RSTRING_LEN(desc) > 65) { desc = rb_any_to_s(key); } -- cgit v1.2.3