diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-02-13 19:45:35 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-02-13 19:45:35 +0000 |
commit | 27e492bec76b039f69678c42942d113e1f48d811 (patch) | |
tree | 39b8e2866afd41f828358eb6403fe7c48bad4fc2 /marshal.c | |
parent | be0197054c8c9634f413bc472425a1a8650c77cd (diff) | |
download | ruby-27e492bec76b039f69678c42942d113e1f48d811.tar.gz |
* 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
Diffstat (limited to 'marshal.c')
-rw-r--r-- | marshal.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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; |