diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-05 22:27:46 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-05 22:27:46 +0000 |
commit | 0be34e2a497ec376e3a96e95a2374abe3ad6a7c6 (patch) | |
tree | f1c4b83567fe7acfae9ca537c25dc4881cd8e268 | |
parent | d4384f1230af19b065f62a33b27ac21143235304 (diff) | |
download | ruby-0be34e2a497ec376e3a96e95a2374abe3ad6a7c6.tar.gz |
* transcode.c (rb_econv_open): fail for ASCII incompatible with
newline conversion.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19167 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | test/ruby/test_econv.rb | 22 | ||||
-rw-r--r-- | transcode.c | 13 |
3 files changed, 40 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Sat Sep 6 07:27:00 2008 Tanaka Akira <akr@fsij.org> + + * transcode.c (rb_econv_open): fail for ASCII incompatible with + newline conversion. + Sat Sep 6 07:24:49 2008 Tanaka Akira <akr@fsij.org> * io.c (rb_io_extract_modeenc): raise an error for ASCII incompatible diff --git a/test/ruby/test_econv.rb b/test/ruby/test_econv.rb index be4917ddf7..cb902d76f8 100644 --- a/test/ruby/test_econv.rb +++ b/test/ruby/test_econv.rb @@ -54,6 +54,28 @@ class TestEncodingConverter < Test::Unit::TestCase assert(!encoding_list.include?(name2)) end + def test_newline_converter_with_ascii_incompatible + assert_raise(Encoding::NoConverter) { + Encoding::Converter.new("UTF-8", "UTF-16BE", Encoding::Converter::UNIVERSAL_NEWLINE_DECODER) + } + assert_raise(Encoding::NoConverter) { + Encoding::Converter.new("UTF-16BE", "UTF-8", Encoding::Converter::CRLF_NEWLINE_ENCODER) + } + assert_raise(Encoding::NoConverter) { + Encoding::Converter.new("UTF-16BE", "UTF-8", Encoding::Converter::CR_NEWLINE_ENCODER) + } + + assert_nothing_raised { + Encoding::Converter.new("UTF-16BE", "UTF-8", Encoding::Converter::UNIVERSAL_NEWLINE_DECODER) + } + assert_nothing_raised { + Encoding::Converter.new("UTF-8", "UTF-16BE", Encoding::Converter::CRLF_NEWLINE_ENCODER) + } + assert_nothing_raised { + Encoding::Converter.new("UTF-8", "UTF-16BE", Encoding::Converter::CR_NEWLINE_ENCODER) + } + end + def test_get_encoding ec = Encoding::Converter.new("UTF-8", "EUC-JP") assert_equal(Encoding::UTF_8, ec.source_encoding) diff --git a/transcode.c b/transcode.c index 6496c75c76..3dbdb44d1c 100644 --- a/transcode.c +++ b/transcode.c @@ -913,6 +913,19 @@ rb_econv_open(const char *sname, const char *dname, int ecflags) } num_additional = 0; + + if (*sname && (!senc || !rb_enc_asciicompat(senc)) && + (ecflags & (ECONV_CRLF_NEWLINE_ENCODER|ECONV_CR_NEWLINE_ENCODER))) { + xfree(entries); + return NULL; + } + + if (*dname && (!denc || !rb_enc_asciicompat(denc)) && + (ecflags & (ECONV_UNIVERSAL_NEWLINE_DECODER))) { + xfree(entries); + return NULL; + } + if ((!*sname || (senc && rb_enc_asciicompat(senc))) && (ecflags & (ECONV_CRLF_NEWLINE_ENCODER|ECONV_CR_NEWLINE_ENCODER))) { const char *name = (ecflags & ECONV_CRLF_NEWLINE_ENCODER) ? "crlf_newline" : "cr_newline"; |