summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-02-14 03:54:47 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-02-14 03:54:47 +0000
commit05270882aefe8cf9206e4e6dc2d537a7e91dcf86 (patch)
tree165dffdeed74a65d86573695cf215fe22c0aacf6
parent47b8a0e7e4a04a28e57c3f9bb712a1f88d9e27bb (diff)
* 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
-rw-r--r--ChangeLog5
-rw-r--r--marshal.c2
2 files changed, 6 insertions, 1 deletions
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 <nobu@ruby-lang.org>
+
+ * marshal.c (r_object0): removed duplicated entry for regexp.
+ [ruby-dev:40416]
+
Sun Feb 14 04:45:31 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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;