Skip to content
Browse files

merge revision(s) 26103:

	* string.c (rb_str_inspect): wrong result of UTF-8 inspect because of
	  the mistake of calculation.  reported by eban via IRC.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_7@27145 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent eeb5d2f commit edfb6ad961b314c6cce542e8a47d7f263c7f71de @shyouhei shyouhei committed Apr 1, 2010
Showing with 12 additions and 7 deletions.
  1. +5 −0 ChangeLog
  2. +1 −1 string.c
  3. +1 −1 test/ruby/test_string.rb
  4. +5 −5 version.h
View
5 ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 1 05:32:17 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * string.c (rb_str_inspect): wrong result of UTF-8 inspect because of
+ the mistake of calculation. reported by eban via IRC.
+
Sun Jan 10 19:00:31 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/webrick/accesslog.rb : Escape needed.
View
2 string.c
@@ -2642,7 +2642,7 @@ rb_str_inspect(str)
while (p < pend) {
char c = *p++;
int len;
- if (ismbchar(c) && p + (len = mbclen(c)) <= pend) {
+ if (ismbchar(c) && p - 1 + (len = mbclen(c)) <= pend) {
rb_str_buf_cat(result, p - 1, len);
p += len - 1;
}
View
2 test/ruby/test_string.rb
@@ -24,7 +24,7 @@ def test_inspect
assert_equal('"\343\201\202"', "\xe3\x81\x82".inspect)
$KCODE = 'u'
- assert_equal('"\\343\\201\\202"', "\xe3\x81\x82".inspect)
+ assert_equal("\"\343\201\202\"", "\xe3\x81\x82".inspect)
assert_no_match(/\0/, "\xe3\x81".inspect, '[ruby-dev:39550]')
ensure
$KCODE = original_kcode
View
10 version.h
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2010-01-10"
+#define RUBY_RELEASE_DATE "2010-04-01"
#define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20100110
-#define RUBY_PATCHLEVEL 249
+#define RUBY_RELEASE_CODE 20100401
+#define RUBY_PATCHLEVEL 250
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 7
#define RUBY_RELEASE_YEAR 2010
-#define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 10
+#define RUBY_RELEASE_MONTH 4
+#define RUBY_RELEASE_DAY 1
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];

0 comments on commit edfb6ad

Please sign in to comment.
Something went wrong with that request. Please try again.