From 1521f9331e2aa74fd3248d9cb5392735a2eb36cc Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 28 Mar 2012 06:06:20 +0000
Subject: * 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
---
 marshal.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'marshal.c')

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);
 
-- 
cgit v1.2.3