From 1521f9331e2aa74fd3248d9cb5392735a2eb36cc Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 28 Mar 2012 06:06:20 +0000 Subject: [PATCH] * marshal.c (r_symreal): default to ASCII-8BIT for non-ascii symbols, otherwise it should be converted to US-ASCII in rb_intern_str() if possible. [ruby-core:43762][Bug #6209] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35157 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ marshal.c | 3 +-- test/ruby/test_marshal.rb | 9 +++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2cdb9b7b1a..494ff2ec74 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Mar 28 15:06:18 2012 Nobuyoshi Nakada + + * marshal.c (r_symreal): default to ASCII-8BIT for non-ascii symbols, + otherwise it should be converted to US-ASCII in rb_intern_str() if + possible. [ruby-core:43762][Bug #6209] + Wed Mar 28 08:44:24 2012 Aaron Patterson * ext/psych/lib/psych.rb: updating version to match gem diff --git a/marshal.c b/marshal.c index 5db23fcbc6..3b9f93e545 100644 --- a/marshal.c +++ b/marshal.c @@ -1161,8 +1161,7 @@ r_symreal(struct load_arg *arg, int ivar) idx = id2encidx(id, r_object(arg)); } } - if (idx < 0) idx = rb_usascii_encindex(); - rb_enc_associate_index(s, idx); + if (idx > 0) rb_enc_associate_index(s, idx); id = rb_intern_str(s); st_insert(arg->symbols, (st_data_t)n, (st_data_t)id); diff --git a/test/ruby/test_marshal.rb b/test/ruby/test_marshal.rb index 15951bff36..1dea7e14dd 100644 --- a/test/ruby/test_marshal.rb +++ b/test/ruby/test_marshal.rb @@ -455,6 +455,15 @@ class TestMarshal < Test::Unit::TestCase assert_equal(o1, o2) end + def test_marshal_symbol_ascii8bit + bug6209 = '[ruby-core:43762]' + o1 = "\xff".force_encoding("ASCII-8BIT").intern + m = Marshal.dump(o1) + o2 = nil + assert_nothing_raised(EncodingError, bug6209) {o2 = Marshal.load(m)} + assert_equal(o1, o2, bug6209) + end + class PrivateClass def initialize(foo) @foo = foo