diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-10-28 18:04:23 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-10-28 18:04:23 +0000 |
commit | 30ab36c7dc743d584a1534c5695ba37fbfb1c78e (patch) | |
tree | a2fbabf7aff4bbcda37b2d3dad98aaf024e77f63 | |
parent | 87c0b99446b0aa2265e25d0cf06ba5676e1683a9 (diff) | |
download | ruby-30ab36c7dc743d584a1534c5695ba37fbfb1c78e.tar.gz |
* string.c (rb_str_dump): fix expected length. [ruby-core:32935]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29622 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | string.c | 9 | ||||
-rw-r--r-- | test/ruby/test_stringchar.rb | 15 |
3 files changed, 23 insertions, 5 deletions
@@ -1,3 +1,7 @@ +Fri Oct 29 03:04:16 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * string.c (rb_str_dump): fix expected length. [ruby-core:32935] + Thu Oct 28 23:31:39 2010 Koichi Sasada <ko1@atdot.net> * gc.c (before_gc_sweep, run_final): fix decrement timing of final_num. @@ -4315,12 +4315,11 @@ rb_str_dump(VALUE str) } else { if (u8) { /* \u{NN} */ - char buf[32]; int n = rb_enc_precise_mbclen(p-1, pend, enc); - if (MBCLEN_CHARFOUND_P(n)) { - int cc = rb_enc_mbc_to_codepoint(p-1, pend, enc); - sprintf(buf, "%x", cc); - len += strlen(buf)+4; + if (MBCLEN_CHARFOUND_P(n-1)) { + unsigned int cc = rb_enc_mbc_to_codepoint(p-1, pend, enc); + while (cc >>= 4) len++; + len += 5; p += MBCLEN_CHARFOUND_LEN(n)-1; break; } diff --git a/test/ruby/test_stringchar.rb b/test/ruby/test_stringchar.rb index b70f171c84..44c8634c02 100644 --- a/test/ruby/test_stringchar.rb +++ b/test/ruby/test_stringchar.rb @@ -163,4 +163,19 @@ EOS s.delete!("a-z") assert_equal("BB", s) end + + def test_dump + bug3996 = '[ruby-core:32935]' + Encoding.list.find_all {|enc| enc.ascii_compatible?}.each do |enc| + (0..256).map do |c| + begin + s = c.chr(enc) + rescue RangeError, ArgumentError + break + else + assert_not_match(/\0/, s.dump, bug3996) + end + end + end + end end |