merge revision(s) 25515:

	* string.c (rb_str_inspect): get rid of adding garbage to shor
	  UTF-8 string.  [ruby-dev:39550]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@26078 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 21 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 79acf87100..72bd1d4317 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 14 00:42:55 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* 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@ruby-lang.org>
 
 	* marshal.c (marshal_load): should set taintness.  [ruby-dev:39723]
diff --git a/string.c b/string.c
index 4de0954a46..69430c6cfc 100644
--- a/string.c
+++ b/string.c
@@ -2641,8 +2641,8 @@ rb_str_inspect(str)
     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;
 	}
diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb
index f8938cad84..cb1bd575e5 100644
--- a/test/ruby/test_string.rb
+++ b/test/ruby/test_string.rb
@@ -16,4 +16,17 @@ class TestString < Test::Unit::TestCase
       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
diff --git a/version.h b/version.h
index a951de1ca8..fefda523ea 100644
--- a/version.h
+++ b/version.h
@@ -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