yugui	2010-12-08 17:09:02 +0900 (Wed, 08 Dec 2010)

  New Revision: 30129

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30129

  Log:
    merges r29622 from trunk into ruby_1_9_2.
    --
    * string.c (rb_str_dump): fix expected length. [ruby-core:32935]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/string.c
    branches/ruby_1_9_2/test/ruby/test_stringchar.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30128)
+++ ruby_1_9_2/ChangeLog	(revision 30129)
@@ -1,3 +1,7 @@
+Fri Oct 29 03:04:16 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* string.c (rb_str_dump): fix expected length. [ruby-core:32935]
+
 Thu Oct 21 15:42:01 2010  NARUSE, Yui  <naruse@r...>
 
 	* lib/net/telnet.rb (Net::Telnet#close): added.
Index: ruby_1_9_2/string.c
===================================================================
--- ruby_1_9_2/string.c	(revision 30128)
+++ ruby_1_9_2/string.c	(revision 30129)
@@ -4263,12 +4263,11 @@
 	    }
 	    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;
 		    }
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30128)
+++ ruby_1_9_2/version.h	(revision 30129)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 83
+#define RUBY_PATCHLEVEL 84
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
Index: ruby_1_9_2/test/ruby/test_stringchar.rb
===================================================================
--- ruby_1_9_2/test/ruby/test_stringchar.rb	(revision 30128)
+++ ruby_1_9_2/test/ruby/test_stringchar.rb	(revision 30129)
@@ -163,4 +163,19 @@
     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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/