From: Steve Dower <steve.dower@microsoft.com>
Date: Sun, 6 Sep 2015 06:09:00 +0000 (-0700)
Subject: Backed out changeset: a29b49d57769
X-Git-Tag: v3.5.1rc1~427^2~11^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ef920d6d5e38cebd51b17001d614b55b1c468041;p=thirdparty%2FPython%2Fcpython.git

Backed out changeset: a29b49d57769
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 834e20a81588..dd175fead46e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -84,8 +84,6 @@ Library
 - Issue #16180: Exit pdb if file has syntax error, instead of trapping user
   in an infinite loop.  Patch by Xavier de Gaye.
 
-- Issue #24917: time_strftime() Buffer Over-read. Patch by John Leitch.
-
 - Issue #21112: Fix regression in unittest.expectedFailure on subclasses.
   Patch from Berker Peksag.
 
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index f7295946917e..d0917a40730b 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -662,12 +662,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