diff --git a/ChangeLog b/ChangeLog
index 8666d1cb57..66de010ae0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri May 21 19:11:42 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/nkf/nkf.c (rb_nkf_convert, rb_nkf_guess): check too huge
+	  string.
+
 Thu May 20 22:19:37 2010  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* vm_eval.c (rb_f_caller): update rdoc.  a patch from Nobuhiro IMAI
diff --git a/ext/nkf/nkf.c b/ext/nkf/nkf.c
index 1eb4104357..05fd36de64 100644
--- a/ext/nkf/nkf.c
+++ b/ext/nkf/nkf.c
@@ -155,12 +155,12 @@ rb_nkf_convert(VALUE obj, VALUE opt, VALUE src)
     input_ctr = 0;
     StringValue(src);
     input = (unsigned char *)RSTRING_PTR(src);
-    i_len = RSTRING_LEN(src);
+    i_len = RSTRING_LENINT(src);
     tmp = result = rb_str_new(0, i_len*3 + 10);
 
     output_ctr = 0;
     output     = (unsigned char *)RSTRING_PTR(result);
-    o_len      = RSTRING_LEN(result);
+    o_len      = RSTRING_LENINT(result);
     *output    = '\0';
 
     kanji_convert(NULL);
@@ -192,7 +192,7 @@ rb_nkf_guess(VALUE obj, VALUE src)
     input_ctr = 0;
     StringValue(src);
     input = (unsigned char *)RSTRING_PTR(src);
-    i_len = RSTRING_LEN(src);
+    i_len = RSTRING_LENINT(src);
 
     guess_f = TRUE;
     kanji_convert( NULL );
diff --git a/version.h b/version.h
index 72a9ffd1e1..ad610a1ce5 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_RELEASE_DATE "2010-05-20"
+#define RUBY_RELEASE_DATE "2010-05-21"
 #define RUBY_PATCHLEVEL -1
 
 #define RUBY_VERSION_MAJOR 1
@@ -7,7 +7,7 @@
 #define RUBY_VERSION_TEENY 1
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 20
+#define RUBY_RELEASE_DAY 21
 
 #include "ruby/version.h"