diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | marshal.c | 10 | ||||
| -rw-r--r-- | test/ruby/test_marshal.rb | 8 |
3 files changed, 19 insertions, 4 deletions
@@ -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. @@ -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 172bfbb3f7..a697706632 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 |