From: Larry Hastings <larry@hastings.org>
Date: Sun, 6 Sep 2015 07:31:02 +0000 (-0700)
Subject: Backing out 09b62202d9b7; the tests fail on Linux, and it needs a re-think.
X-Git-Tag: v3.5.0rc3~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=62b24624dd3eec75869372e08d5ecbc4b8976101;p=python

Backing out 09b62202d9b7; the tests fail on Linux, and it needs a re-think.
---

diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
index 3f571a0e6f..6334e022e0 100644
--- a/Lib/test/test_time.py
+++ b/Lib/test/test_time.py
@@ -174,12 +174,6 @@ class TimeTestCase(unittest.TestCase):
     def test_strftime_bounding_check(self):
         self._bounds_checking(lambda tup: time.strftime('', tup))
 
-    def test_strftime_format_check(self):
-        for x in [ '', 'A', '%A', '%AA' ]:
-            for y in range(0x0, 0x10):
-                for z in [ '%', 'A%', 'AA%', '%A%', 'A%A%', '%#' ]:
-                    self.assertRaises(ValueError, time.strftime, x * y + z)
-
     def test_default_values_for_zero(self):
         # Make sure that using all zeros uses the proper default
         # values.  No test for daylight savings since strftime() does
diff --git a/Misc/NEWS b/Misc/NEWS
index ba24851f11..5ac6df9f29 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -22,8 +22,6 @@ Library
   to support Python modules replacing themselves with extension modules.
   Patch by Petr Viktorin.
 
-- Issue #24917: time_strftime() Buffer Over-read. Patch by John Leitch.
-
 - Issue #24635: Fixed a bug in typing.py where isinstance([], typing.Iterable)
   would return True once, then False on subsequent calls.
 
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 55e26fa8a2..197d2c0b8d 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -623,12 +623,6 @@ time_strftime(PyObject *self, PyObject *args)
             Py_DECREF(format);
             return NULL;
         }
-        else if (outbuf[1] == '\0')
-        {
-            PyErr_SetString(PyExc_ValueError, "Incomplete format string");
-            Py_DECREF(format);
-            return NULL;
-        }
     }
 #elif (defined(_AIX) || defined(sun)) && defined(HAVE_WCSFTIME)
     for(outbuf = wcschr(fmt, '%');
@@ -642,12 +636,6 @@ time_strftime(PyObject *self, PyObject *args)
                             "format %y requires year >= 1900 on AIX");
             return NULL;
         }
-        else if (outbuf[1] == '\0')
-        {
-            PyErr_SetString(PyExc_ValueError, "Incomplete format string");
-            Py_DECREF(format);
-            return NULL;
-        }
     }
 #endif