summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZackery Spytz <zspytz@gmail.com>2018-09-21 00:09:48 -0600
committerSerhiy Storchaka <storchaka@gmail.com>2018-09-21 09:09:48 +0300
commit91e6c8717b7dcbcc46b189509de5f2d335819f37 (patch)
tree8fb5e38471f96e5816d698f83525d2c973095257
parentc510c6b8b60f211793e0b84c317ea6974e8a6153 (diff)
downloadcpython-git-91e6c8717b7dcbcc46b189509de5f2d335819f37.tar.gz
bpo-34735: Fix a memory leak in Modules/timemodule.c (GH-9418)
There was a missing PyMem_Free(format) in time_strftime().
-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;
}
}