Issue #19748: On AIX, time.mktime() now raises an OverflowError for year

outsize range [1902; 2037].

diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
index 4bd1757b9c077957296c7975faeff339e4fa236c..2aa22969d781641e00e921ee95271b1302cbaaff 100644 (file)
--- a/Lib/test/test_time.py
+++ b/Lib/test/test_time.py
@@ -228,7 +228,7 @@ class TimeTestCase(unittest.TestCase):
         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 --git a/Misc/NEWS b/Misc/NEWS
index b4374cc4879747cea5f869cd3b90247de2381062..4eaca12e3401d2a3075fc0b42d96cf6715bd614f 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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 --git a/Modules/timemodule.c b/Modules/timemodule.c
index 44540ea919741eebf8b3ff26bd510550fb378449..d0917a40730b813cd2ee7575e8694b9e16507175 100644 (file)
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -823,7 +823,18 @@ time_mktime(PyObject *self, PyObject *tup)
     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. */