changeset:   97699:73227e857d6b
branch:      3.5
parent:      97696:7cdadcc1002d
parent:      97698:f15c5b0f51a4
user:        Steve Dower <steve.dower@microsoft.com>
date:        Sat Sep 05 23:11:53 2015 -0700
files:       Lib/test/test_time.py Misc/NEWS Modules/timemodule.c
description:
Issue #24917: Backed out changeset 09b62202d9b7


diff -r 7cdadcc1002d -r 73227e857d6b Lib/test/test_time.py
--- a/Lib/test/test_time.py	Sat Sep 05 20:59:41 2015 -0700
+++ b/Lib/test/test_time.py	Sat Sep 05 23:11:53 2015 -0700
@@ -174,12 +174,6 @@
     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 -r 7cdadcc1002d -r 73227e857d6b Misc/NEWS
--- a/Misc/NEWS	Sat Sep 05 20:59:41 2015 -0700
+++ b/Misc/NEWS	Sat Sep 05 23:11:53 2015 -0700
@@ -95,8 +95,6 @@
 Library
 -------
 
-- 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 -r 7cdadcc1002d -r 73227e857d6b Modules/timemodule.c
--- a/Modules/timemodule.c	Sat Sep 05 20:59:41 2015 -0700
+++ b/Modules/timemodule.c	Sat Sep 05 23:11:53 2015 -0700
@@ -623,12 +623,6 @@
             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 @@
                             "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