summaryrefslogtreecommitdiff
path: root/re.c
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-18 10:43:41 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-18 10:43:41 +0000
commitb5296022863787b9bc9ce161cf1e02d381d0b722 (patch)
treed5369f1d7f9f0545920e9cf0ad74ba38d838bae3 /re.c
parent7c9904b29ec16ddce76fb167ab20afca4a571476 (diff)
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
Diffstat (limited to 're.c')
-rw-r--r--re.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/re.c b/re.c
index 8e2dcbd7cd..0c31751f7f 100644
--- a/re.c
+++ b/re.c
@@ -587,7 +587,7 @@ rb_reg_to_s(VALUE re)
static void
rb_reg_raise(const char *s, long len, const char *err, VALUE re)
{
- VALUE desc = rb_reg_desc(s, len, re);
+ volatile VALUE desc = rb_reg_desc(s, len, re);
rb_raise(rb_eRegexpError, "%s: %s", err, RSTRING_PTR(desc));
}