summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-18 14:51:18 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-18 14:51:18 +0000
commit1aa21e630faab9d1d99f686d98e9b951c0b39488 (patch)
treedf9ebd95347fb9d8425bc7f4083fdd2f3cf94162
parentd36c76dc71b47b201707185b8a0b4264e83de205 (diff)
* marshal.c (r_object0): entry regexp object before its encoding
name. [ruby-core:25625] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25001 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--marshal.c10
-rw-r--r--test/ruby/test_marshal.rb8
3 files changed, 19 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 0e20a6f3a10..7a4eeeb87ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep 18 23:51:17 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * marshal.c (r_object0): entry regexp object before its encoding
+ name. [ruby-core:25625]
+
Fri Sep 18 16:29:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (eval.o): needs vm.h.
diff --git a/marshal.c b/marshal.c
index 300391191ef..aaeef31adb5 100644
--- a/marshal.c
+++ b/marshal.c
@@ -1444,7 +1444,10 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
{
volatile VALUE str = r_bytes(arg);
int options = r_byte(arg);
- v = rb_reg_new("", 0, options);
+ VALUE args[2];
+ args[0] = str;
+ args[1] = INT2FIX(options);
+ v = r_entry(rb_obj_alloc(rb_cRegexp), arg);
if (ivp) {
r_ivar(v, arg);
*ivp = FALSE;
@@ -1455,9 +1458,8 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
#define f_gsub_bang(x,y,z) rb_funcall(x, rb_intern("gsub!"), 2, y, z)
f_gsub_bang(str, rb_reg_new("\\\\u", 3, 0), rb_usascii_str_new_cstr("u"));
}
- str = r_entry(rb_reg_new_str(str, options), arg);
- rb_copy_generic_ivar(str, v);
- v = r_leave(str, arg);
+ rb_obj_call_init(v, 2, args);
+ v = r_leave(v, arg);
}
break;
diff --git a/test/ruby/test_marshal.rb b/test/ruby/test_marshal.rb
index 172bfbb3f78..a697706632c 100644
--- a/test/ruby/test_marshal.rb
+++ b/test/ruby/test_marshal.rb
@@ -204,4 +204,12 @@ class TestMarshal < Test::Unit::TestCase
a = ClassUTF8.new
assert_instance_of(ClassUTF8, Marshal.load(Marshal.dump(a)), '[ruby-core:24790]')
end
+
+ def test_regexp
+ bug2109 = '[ruby-core:25625]'
+ a = "\x82\xa0".force_encoding(Encoding::Windows_31J)
+ b = "\x82\xa2".force_encoding(Encoding::Windows_31J)
+ c = [/#{a}/, /#{b}/]
+ assert_equal(c, Marshal.load(Marshal.dump(c)))
+ end
end