2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8c0c8cb9d3..56d2b26566 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun 11 23:21:35 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (init_leap_second_info): check the result of
+	  gmtime_with_leapsecond.
+
 Fri Jun 11 23:04:59 2010  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/openssl/ossl_ssl.c (ossl_sslctx_get_ciphers):
diff --git a/time.c b/time.c
index 2623850efb..dae48091a6 100644
--- a/time.c
+++ b/time.c
@@ -1280,7 +1280,8 @@ init_leap_second_info()
         else
             known_leap_seconds_limit = now + (time_t)(366*86400);
 
-        gmtime_with_leapsecond(&known_leap_seconds_limit, &result);
+        if (!gmtime_with_leapsecond(&known_leap_seconds_limit, &result))
+            return;
 
         vtm.year = LONG2NUM(result.tm_year + 1900);
         vtm.mon = result.tm_mon + 1;