diff --git a/ChangeLog b/ChangeLog
index 832e702a0e..69a3e408b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Apr  6 15:11:56 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (int_chr): checsk overflow.
+
+Mon Apr  6 10:49:47 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/stringio/test_stringio.rb (test_path): StringIO#path is no
+	  longer defined.  [ruby-dev:38254]
+
 Mon Apr  6 10:47:13 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/stringio/stringio.c (strio_path): removed.  [ruby-dev:38254]
diff --git a/numeric.c b/numeric.c
index f86ff1a12a..4816140d97 100644
--- a/numeric.c
+++ b/numeric.c
@@ -1969,7 +1969,10 @@ int_chr(int argc, VALUE *argv, VALUE num)
     }
     enc = rb_to_encoding(argv[0]);
     if (!enc) enc = rb_ascii8bit_encoding();
-    if (i < 0 || (n = rb_enc_codelen(i, enc)) <= 0) goto out_of_range;
+#if SIZEOF_INT < SIZEOF_LONG
+    if (i > INT_MAX) goto out_of_range;
+#endif
+    if (i < 0 || (n = rb_enc_codelen((int)i, enc)) <= 0) goto out_of_range;
     str = rb_enc_str_new(0, n, enc);
     rb_enc_mbcput(i, RSTRING_PTR(str), enc);
     return str;