Use 1970-01-01 00:00:00 for time that can't be handled by mktime()

refs #1476
mroonga · Oct 24, 2012 · 8a10500 · 8a10500
1 parent 85ca0c6
commit 8a10500
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/ha_mroonga.cpp b/ha_mroonga.cpp
@@ -1505,8 +1505,13 @@ static int mrn_set_geometry(grn_ctx *ctx, grn_obj *buf,
 static long long int mrn_tm_to_grn_time(struct tm *time, int usec)
 {
   MRN_DBUG_ENTER_FUNCTION();
-  long long int sec = mktime(time) + mrn_utc_diff_in_seconds;
-  long long int grn_time = GRN_TIME_PACK(sec, usec);
+  long long int grn_time;
+  long long int sec = mktime(time);
+  if (sec == -1) {
+    grn_time = 0;
+  } else {
+    grn_time = GRN_TIME_PACK(sec + mrn_utc_diff_in_seconds, usec);
+  }
   DBUG_RETURN(grn_time);
 }