diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ext/iconv/iconv.c | 5 | ||||
| -rw-r--r-- | test/iconv/test_basic.rb | 7 |
3 files changed, 18 insertions, 2 deletions
@@ -1,3 +1,11 @@ +Tue Oct 21 11:34:04 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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. + Tue Oct 21 10:40:37 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * io.c (rb_file_open_internal): should initialize fmode before using. 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); diff --git a/test/iconv/test_basic.rb b/test/iconv/test_basic.rb index ea564e91f1..394d271bc1 100644 --- a/test/iconv/test_basic.rb +++ b/test/iconv/test_basic.rb @@ -43,6 +43,13 @@ class TestIconv::Basic < TestIconv assert_equal("#{SJIS_STR}\n"*2, output) end + def test_invalid_arguments + assert_raise(TypeError) { Iconv.new(nil, 'Shift_JIS') } + assert_raise(TypeError) { Iconv.new('Shift_JIS', nil) } + assert_raise(TypeError) { Iconv.open(nil, 'Shift_JIS') } + assert_raise(TypeError) { Iconv.open('Shift_JIS', nil) } + end + def test_unknown_encoding assert_raise(Iconv::InvalidEncoding) { Iconv.iconv("utf-8", "X-UKNOWN", "heh") } end |