From 27e492bec76b039f69678c42942d113e1f48d811 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 13 Feb 2010 19:45:35 +0000 Subject: * marshal.c (r_object0): register regexp object before encoding name. [ruby-dev:40414] * re.c (rb_reg_alloc, rb_reg_init_str): split from rb_reg_new_str. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26661 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- marshal.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'marshal.c') diff --git a/marshal.c b/marshal.c index deb7d2853b..e8f43d90ee 100644 --- a/marshal.c +++ b/marshal.c @@ -1495,6 +1495,7 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod) int options = r_byte(arg); int has_encoding = FALSE; + v = r_entry(rb_reg_alloc(), arg); if (ivp) { r_ivar(str, &has_encoding, arg); *ivp = FALSE; @@ -1518,7 +1519,7 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod) } rb_str_set_len(str, dst - ptr); } - v = r_entry(rb_reg_new_str(str, options), arg); + v = r_entry(rb_reg_init_str(v, str, options), arg); v = r_leave(v, arg); } break; -- cgit v1.2.3