summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Misc/NEWS.d/next/Core and Builtins/2018-09-19-06-57-34.bpo-34735.-3mrSJ.rst1
-rw-r--r--Modules/timemodule.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-09-19-06-57-34.bpo-34735.-3mrSJ.rst b/Misc/NEWS.d/next/Core and Builtins/2018-09-19-06-57-34.bpo-34735.-3mrSJ.rst
new file mode 100644
index 0000000000..8de08ec386
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2018-09-19-06-57-34.bpo-34735.-3mrSJ.rst
@@ -0,0 +1 @@
+Fix a memory leak in Modules/timemodule.c. Patch by Zackery Spytz.
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index d162d93c9c..f41d6fab95 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -801,6 +801,7 @@ time_strftime(PyObject *self, PyObject *args)
if (outbuf[1] == L'y' && buf.tm_year < 0) {
PyErr_SetString(PyExc_ValueError,
"format %y requires year >= 1900 on AIX");
+ PyMem_Free(format);
return NULL;
}
}