From 5225f2c143fa69d73c1b90818a8b6a5be1175379 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 21 Oct 2008 02:34:07 +0000
Subject: * ext/iconv/iconv.c (strip_glibc_option, map_charset): check if  
 encoding is a string.  based on the patch by Hiroshi Moriyama at  
 [ruby-dev:36811].

* test/iconv/test_basic.rb (test_invalid_arguments): added tests.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19866 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/iconv/iconv.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'ext/iconv')

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index f80a553edc..6ff49e5b5c 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -144,9 +144,10 @@ charset_map_get(void)
 static VALUE
 strip_glibc_option(VALUE *code)
 {
-    VALUE val = *code;
+    VALUE val = StringValue(*code);
     const char *ptr = RSTRING_PTR(val), *pend = RSTRING_END(val);
     const char *slash = memchr(ptr, '/', pend - ptr);
+
     if (slash && slash < pend - 1 && slash[1] ==  '/') {
 	VALUE opt = rb_str_subseq(val, slash - ptr, pend - slash);
 	val = rb_str_subseq(val, 0, slash - ptr);
@@ -159,7 +160,7 @@ strip_glibc_option(VALUE *code)
 static char *
 map_charset(VALUE *code)
 {
-    VALUE val = *code;
+    VALUE val = StringValue(*code);
 
     if (RHASH_SIZE(charset_map)) {
 	VALUE key = rb_funcall2(val, rb_intern("downcase"), 0, 0);
-- 
cgit v1.2.3