Add time overflow check for 32bit environment

mroonga · Oct 24, 2012 · f5dab85 · f5dab85
1 parent 0c3240f
commit f5dab85
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/ha_mroonga.cpp b/ha_mroonga.cpp
@@ -1507,7 +1507,9 @@ static long long int mrn_tm_to_grn_time(struct tm *time, int usec)
   MRN_DBUG_ENTER_FUNCTION();
   long long int grn_time;
   long long int sec = mktime(time);
-  if (sec == -1) {
+  bool failed = (sec == -1);
+  bool overflowed = (time.tm_year >= 0 && sec < 0);
+  if (failed || overflowed) {
     grn_time = 0;
   } else {
     grn_time = GRN_TIME_PACK(sec + mrn_utc_diff_in_seconds, usec);