ruby-changes:14254
From: shyouhei <ko1@a...>
Date: Mon, 14 Dec 2009 01:00:03 +0900 (JST)
Subject: [ruby-changes:14254] Ruby:r26078 (ruby_1_8_7): merge revision(s) 25515:
shyouhei 2009-12-14 00:59:51 +0900 (Mon, 14 Dec 2009) New Revision: 26078 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=26078 Log: merge revision(s) 25515: * string.c (rb_str_inspect): get rid of adding garbage to shor UTF-8 string. [ruby-dev:39550] Modified files: branches/ruby_1_8_7/ChangeLog branches/ruby_1_8_7/string.c branches/ruby_1_8_7/test/ruby/test_string.rb branches/ruby_1_8_7/version.h Index: ruby_1_8_7/ChangeLog =================================================================== --- ruby_1_8_7/ChangeLog (revision 26077) +++ ruby_1_8_7/ChangeLog (revision 26078) @@ -1,3 +1,8 @@ +Mon Dec 14 00:42:55 2009 Nobuyoshi Nakada <nobu@r...> + + * string.c (rb_str_inspect): get rid of adding garbage to shor + UTF-8 string. [ruby-dev:39550] + Sun Dec 13 23:54:22 2009 Nobuyoshi Nakada <nobu@r...> * marshal.c (marshal_load): should set taintness. [ruby-dev:39723] Index: ruby_1_8_7/version.h =================================================================== --- ruby_1_8_7/version.h (revision 26077) +++ ruby_1_8_7/version.h (revision 26078) @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2009-12-14" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20091214 -#define RUBY_PATCHLEVEL 226 +#define RUBY_PATCHLEVEL 227 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 Index: ruby_1_8_7/string.c =================================================================== --- ruby_1_8_7/string.c (revision 26077) +++ ruby_1_8_7/string.c (revision 26078) @@ -2641,8 +2641,8 @@ p = RSTRING(str)->ptr; pend = p + RSTRING(str)->len; while (p < pend) { char c = *p++; - if (ismbchar(c) && p < pend) { - int len = mbclen(c); + int len; + if (ismbchar(c) && p + (len = mbclen(c)) <= pend) { rb_str_buf_cat(result, p - 1, len); p += len - 1; } Index: ruby_1_8_7/test/ruby/test_string.rb =================================================================== --- ruby_1_8_7/test/ruby/test_string.rb (revision 26077) +++ ruby_1_8_7/test/ruby/test_string.rb (revision 26078) @@ -16,4 +16,17 @@ check_sum("xyz", bits) } end + + def test_inspect + original_kcode = $KCODE + + $KCODE = 'n' + assert_equal('"\343\201\202"', "\xe3\x81\x82".inspect) + + $KCODE = 'u' + assert_equal('"\\343\\201\\202"', "\xe3\x81\x82".inspect) + assert_no_match(/\0/, "\xe3\x81".inspect, '[ruby-dev:39550]') + ensure + $KCODE = original_kcode + end end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/