changeset:   89316:502c8b7e8ad2
user:        Victor Stinner <victor.stinner@gmail.com>
date:        Fri Feb 21 09:27:17 2014 +0100
files:       Lib/test/test_time.py Misc/NEWS Modules/timemodule.c
description:
Issue #19748: On AIX, time.mktime() now raises an OverflowError for year
outsize range [1902; 2037].


diff -r 5e73bb72662e -r 502c8b7e8ad2 Lib/test/test_time.py
--- a/Lib/test/test_time.py	Thu Feb 20 23:34:46 2014 -0800
+++ b/Lib/test/test_time.py	Fri Feb 21 09:27:17 2014 +0100
@@ -228,7 +228,7 @@
         self.assertEqual(time.ctime(t), 'Sun Sep 16 01:03:52 1973')
         t = time.mktime((2000, 1, 1, 0, 0, 0, 0, 0, -1))
         self.assertEqual(time.ctime(t), 'Sat Jan  1 00:00:00 2000')
-        for year in [-100, 100, 1000, 2000, 10000]:
+        for year in [-100, 100, 1000, 2000, 2050, 10000]:
             try:
                 testval = time.mktime((year, 1, 10) + (0,)*6)
             except (ValueError, OverflowError):
diff -r 5e73bb72662e -r 502c8b7e8ad2 Misc/NEWS
--- a/Misc/NEWS	Thu Feb 20 23:34:46 2014 -0800
+++ b/Misc/NEWS	Fri Feb 21 09:27:17 2014 +0100
@@ -2,6 +2,16 @@
 Python News
 +++++++++++
 
+What's New in Python 3.4.1?
+===========================
+
+Library
+-------
+
+- Issue #19748: On AIX, time.mktime() now raises an OverflowError for year
+  outsize range [1902; 2037].
+
+
 What's New in Python 3.4.0 release candidate 2?
 ===============================================
 
diff -r 5e73bb72662e -r 502c8b7e8ad2 Modules/timemodule.c
--- a/Modules/timemodule.c	Thu Feb 20 23:34:46 2014 -0800
+++ b/Modules/timemodule.c	Fri Feb 21 09:27:17 2014 +0100
@@ -823,7 +823,18 @@
     time_t tt;
     if (!gettmarg(tup, &buf))
         return NULL;
+#ifdef _AIX
+    /* year < 1902 or year > 2037 */
+    if (buf.tm_year < 2 || buf.tm_year > 137) {
+        /* Issue #19748: On AIX, mktime() doesn't report overflow error for
+         * timestamp < -2^31 or timestamp > 2**31-1. */
+        PyErr_SetString(PyExc_OverflowError,
+                        "mktime argument out of range");
+        return NULL;
+    }
+#else
     buf.tm_wday = -1;  /* sentinel; original value ignored */
+#endif
     tt = mktime(&buf);
     /* Return value of -1 does not necessarily mean an error, but tm_wday
      * cannot remain set to -1 if mktime succeeded. */