1 files changed, 11 insertions, 2 deletions

diff --git a/src/common.c b/src/common.c
index 473213d6..844dafdf 100644
--- a/src/common.c
+++ b/src/common.c
@@ -81,10 +81,19 @@ GNUNET_GTK_get_expiration_time (GtkSpinButton *spin)
   year = gtk_spin_button_get_value_as_int (spin);
   memset (&t, 0, sizeof (t));
   if (year < 1900)
-    return GNUNET_TIME_absolute_get (); /* now */
+    {
+      GNUNET_break (0);
+      return GNUNET_TIME_absolute_get (); /* now */
+    }
   t.tm_year = year - 1900;
+  t.tm_mday = 1;
+  t.tm_mon = 1;
+  t.tm_wday = 1;
+  t.tm_yday = 1;
   tp = mktime (&t);
-  ret.abs_value = tp * 1000; /* seconds to ms */
+  GNUNET_break (tp != (time_t) -1);
+  ret.abs_value = tp * 1000LL; /* seconds to ms */
+  GNUNET_break (GNUNET_TIME_absolute_get ().abs_value < ret.abs_value);
   return ret;
 }