From 63bc35ffb00b4231beeaae8f7c9b394c107cff92 Mon Sep 17 00:00:00 2001 From: nagachika Date: Wed, 12 Jun 2013 14:23:39 +0000 Subject: merge revision(s) 41250: [Backport #8516] * io.c (io_getc): fix 7bit coderange condition, check if ascii read data instead of read length. [ruby-core:55444] [Bug #8516] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41260 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ io.c | 6 +++++- test/ruby/test_io_m17n.rb | 12 +++++++++++- version.h | 6 +++--- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index c9ee248e37..21baa1f77e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jun 12 23:05:41 2013 Nobuyoshi Nakada + + * io.c (io_getc): fix 7bit coderange condition, check if ascii read + data instead of read length. [ruby-core:55444] [Bug #8516] + Sun Jun 9 02:27:07 2013 Nobuyoshi Nakada * lib/mkmf.rb (install_dirs, with_destdir): prefix with DESTDIR diff --git a/io.c b/io.c index ff30245baf..eece9521f0 100644 --- a/io.c +++ b/io.c @@ -3385,7 +3385,11 @@ io_getc(rb_io_t *fptr, rb_encoding *enc) } else { io_shift_cbuf(fptr, MBCLEN_CHARFOUND_LEN(r), &str); - cr = ISASCII(r) ? ENC_CODERANGE_7BIT : ENC_CODERANGE_VALID; + cr = ENC_CODERANGE_VALID; + if (MBCLEN_CHARFOUND_LEN(r) == 1 && rb_enc_asciicompat(read_enc) && + ISASCII(RSTRING_PTR(str)[0])) { + cr = ENC_CODERANGE_7BIT; + } } str = io_enc_str(str, fptr); ENC_CODERANGE_SET(str, cr); diff --git a/test/ruby/test_io_m17n.rb b/test/ruby/test_io_m17n.rb index 465194b6ca..031b0f4928 100644 --- a/test/ruby/test_io_m17n.rb +++ b/test/ruby/test_io_m17n.rb @@ -2159,7 +2159,17 @@ EOT open("a", "wb") {|f| f.puts "a"} open("a", "rt") {|f| f.getc} } - assert(c.ascii_only?, "should be ascii_only #{bug4557}") + assert_predicate(c, :ascii_only?, bug4557) + end + + def test_getc_conversion + bug8516 = '[ruby-core:55444] [Bug #8516]' + c = with_tmpdir { + open("a", "wb") {|f| f.putc "\xe1"} + open("a", "r:iso-8859-1:utf-8") {|f| f.getc} + } + assert_not_predicate(c, :ascii_only?, bug8516) + assert_equal(1, c.size, bug8516) end def test_default_mode_on_dosish diff --git a/version.h b/version.h index 35742fd006..028d7e8243 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2013-06-09" -#define RUBY_PATCHLEVEL 214 +#define RUBY_RELEASE_DATE "2013-06-12" +#define RUBY_PATCHLEVEL 215 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 9 +#define RUBY_RELEASE_DAY 12 #include "ruby/version.h" -- cgit v1.2.3