diff --git a/ChangeLog b/ChangeLog
index 23e665aed7..aab459609d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jul 18 17:43:12 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_hash_cmp): got rid of overflow.
+
 Sat Jul 18 16:03:01 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* include/ruby/defines.h (TRUE, FALSE): for internal use.
diff --git a/string.c b/string.c
index 493ef5d87b..34f35b8b29 100644
--- a/string.c
+++ b/string.c
@@ -2239,7 +2239,7 @@ rb_str_hash(VALUE str)
 int
 rb_str_hash_cmp(VALUE str1, VALUE str2)
 {
-    int len;
+    long len;
 
     if (!rb_str_comparable(str1, str2)) return 1;
     if (RSTRING_LEN(str1) == (len = RSTRING_LEN(str2)) &&