From 21523e3a98264ae6c936a4f3b9a07c4b3dc1d066 Mon Sep 17 00:00:00 2001 From: mame Date: Sun, 31 Jan 2010 12:46:36 +0000 Subject: * string.c (rb_string_value): make no exception for Symbol. [ruby-dev:40274] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26525 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ string.c | 8 +------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 53e5a7332a..9928e791dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jan 31 21:43:35 2010 Yusuke Endoh + + * string.c (rb_string_value): make no exception for Symbol. + [ruby-dev:40274] + Sun Jan 31 21:10:15 2010 Yusuke Endoh * vm_insnhelper.c (vm_throw): fixed infinite loop. [ruby-core:27969] diff --git a/string.c b/string.c index 109edd36ba..81b9b9d134 100644 --- a/string.c +++ b/string.c @@ -1349,13 +1349,7 @@ rb_string_value(volatile VALUE *ptr) { VALUE s = *ptr; if (TYPE(s) != T_STRING) { - if (SYMBOL_P(s)) { - s = rb_sym_to_s(s); - } - else { - s = rb_str_to_str(s); - } - *ptr = s; + *ptr = rb_str_to_str(s); } return s; } -- cgit v1.2.3