From 05270882aefe8cf9206e4e6dc2d537a7e91dcf86 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 14 Feb 2010 03:54:47 +0000 Subject: * marshal.c (r_object0): removed duplicated entry for regexp. [ruby-dev:40416] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26664 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ marshal.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1cca4c6ed3..d4501781fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Feb 14 12:54:44 2010 Nobuyoshi Nakada + + * marshal.c (r_object0): removed duplicated entry for regexp. + [ruby-dev:40416] + Sun Feb 14 04:45:31 2010 Nobuyoshi Nakada * marshal.c (r_object0): register regexp object before encoding diff --git a/marshal.c b/marshal.c index e8f43d90ee..1b9e62292c 100644 --- a/marshal.c +++ b/marshal.c @@ -1519,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_init_str(v, str, options), arg); + v = rb_reg_init_str(v, str, options); v = r_leave(v, arg); } break; -- cgit v1.2.3