yugui	2011-05-01 18:37:04 +0900 (Sun, 01 May 2011)

  New Revision: 31401

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

  Log:
    merges r30779 from trunk into ruby_1_9_2.
    --
    * string.c (str_utf8_nth): fixed a conditon of optimized lead
      byte counting. [Bug #4366][ruby-dev:43170]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/string.c
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 31400)
+++ ruby_1_9_2/ChangeLog	(revision 31401)
@@ -1,3 +1,8 @@
+Fri Feb  4 12:11:51 2011  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* string.c (str_utf8_nth): fixed a conditon of optimized lead
+	  byte counting. [Bug #4366][ruby-dev:43170]
+
 Fri Feb  4 00:14:55 2011  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/zlib/zlib.c (gzfile_reader_get_unused): no need to dup
Index: ruby_1_9_2/string.c
===================================================================
--- ruby_1_9_2/string.c	(revision 31400)
+++ ruby_1_9_2/string.c	(revision 31401)
@@ -1487,7 +1487,7 @@
 static char *
 str_utf8_nth(const char *p, const char *e, long nth)
 {
-    if ((int)SIZEOF_VALUE < e - p && (int)SIZEOF_VALUE * 2 < nth) {
+    if ((int)SIZEOF_VALUE * 2 < e - p && (int)SIZEOF_VALUE * 2 < nth) {
 	const VALUE *s, *t;
 	const VALUE lowbits = sizeof(VALUE) - 1;
 	s = (const VALUE*)(~lowbits & ((VALUE)p + lowbits));
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 31400)
+++ ruby_1_9_2/version.h	(revision 31401)
@@ -1,13 +1,13 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 188
+#define RUBY_PATCHLEVEL 189
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
 
 #define RUBY_RELEASE_YEAR 2011
-#define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 28
-#define RUBY_RELEASE_DATE "2011-03-28"
+#define RUBY_RELEASE_MONTH 5
+#define RUBY_RELEASE_DAY 1
+#define RUBY_RELEASE_DATE "2011-05-01"
 
 #include "ruby/version.h"
 

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