merges r23568 from trunk into ruby_1_9_1.

--
* string.c (rb_str_each_char, rb_str_each_codepoint): string
  length must be long.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23762 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 402441949..b6ff1d2dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May 26 03:38:37 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_each_char, rb_str_each_codepoint): string
+	  length must be long.
+
 Mon May 25 08:06:52 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* string.c (rb_str_partition): should use the converted result.  a
diff --git a/string.c b/string.c
index 3026de17d..5b73d1b96 100644
--- a/string.c
+++ b/string.c
@@ -5710,7 +5710,7 @@ rb_str_each_byte(VALUE str)
 static VALUE
 rb_str_each_char(VALUE str)
 {
-    int i, len, n;
+    long i, len, n;
     const char *ptr;
     rb_encoding *enc;
 
@@ -5759,7 +5759,8 @@ rb_str_each_char(VALUE str)
 static VALUE
 rb_str_each_codepoint(VALUE str)
 {
-    int len, n;
+    long len;
+    int n;
     unsigned int c;
     const char *ptr, *end;
     rb_encoding *enc;
diff --git a/version.h b/version.h
index cb30b38a2..ea5a8f2b7 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-05-22"
-#define RUBY_PATCHLEVEL 160
+#define RUBY_PATCHLEVEL 161
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1