diff --git a/ChangeLog b/ChangeLog
index 1c16e9ef44..5fc5469d4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jun 11 07:34:25 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (find_time_t): test the result of LOCALTIME.
+
 Mon May 31 15:07:18 2010  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* file.c (file_expand_path): Refix r28102: this breaks
diff --git a/time.c b/time.c
index 0363532924..75f1355286 100644
--- a/time.c
+++ b/time.c
@@ -2870,7 +2870,7 @@ find_time_t(struct tm *tptr, int utc_p, time_t *tp)
 				guess2 += 24 * 60 * 60;
 			    if (guess != guess2) {
 				tm = LOCALTIME(&guess2, result);
-				if (tmcmp(tptr, tm) == 0) {
+				if (tm && tmcmp(tptr, tm) == 0) {
 				    if (guess < guess2)
 					*tp = guess;
 				    else
@@ -2895,7 +2895,7 @@ find_time_t(struct tm *tptr, int utc_p, time_t *tp)
 				guess2 -= 24 * 60 * 60;
 			    if (guess != guess2) {
 				tm = LOCALTIME(&guess2, result);
-				if (tmcmp(tptr, tm) == 0) {
+				if (tm && tmcmp(tptr, tm) == 0) {
 				    if (guess < guess2)
 					*tp = guess2;
 				    else