summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2015-09-06 06:09:00 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2015-09-06 06:09:00 (GMT)
commitef920d6d5e38cebd51b17001d614b55b1c468041 (patch)
treeaf703be82111b458922d8376f9189fde9ae4c729
parent0fba9b324f061a4c8af9f39c3d0befdf29e2a216 (diff)
downloadcpython-ef920d6d5e38cebd51b17001d614b55b1c468041.zip
cpython-ef920d6d5e38cebd51b17001d614b55b1c468041.tar.gz
cpython-ef920d6d5e38cebd51b17001d614b55b1c468041.tar.bz2
Backed out changeset: a29b49d57769
-rw-r--r--Misc/NEWS2
-rw-r--r--Modules/timemodule.c6
2 files changed, 0 insertions, 8 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 834e20a..dd175fe 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 f729594..d0917a4 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