diff --git a/ChangeLog b/ChangeLog
index f8ac4d0389..9492355913 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jul  7 12:00:24 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* file.c (ruby_find_basename): should initialize f.
+
 Wed Jul  7 11:44:01 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/zlib/zlib.c (gzfile_raise): add invalid header to
diff --git a/file.c b/file.c
index 46cf319ff7..63a6ebe61f 100644
--- a/file.c
+++ b/file.c
@@ -3436,7 +3436,7 @@ ruby_find_basename(const char *name, long *len, long *ext)
 #if defined DOSISH_DRIVE_LETTER || defined DOSISH_UNC
     const char *root;
 #endif
-    long f, n = -1;
+    long f = 0, n = -1;
 
     name = skipprefix(name);
 #if defined DOSISH_DRIVE_LETTER || defined DOSISH_UNC