From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 21 Sep 2018 07:41:50 +0000 (-0700)
Subject: bpo-34735: Fix a memory leak in Modules/timemodule.c (GH-9418)
X-Git-Tag: v3.7.1rc1~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=975f3cb1f25406a9be019906227d53b23852f415;p=thirdparty%2FPython%2Fcpython.git

bpo-34735: Fix a memory leak in Modules/timemodule.c (GH-9418)


There was a missing PyMem_Free(format) in time_strftime().
(cherry picked from commit 91e6c8717b7dcbcc46b189509de5f2d335819f37)

Co-authored-by: Zackery Spytz <zspytz@gmail.com>
---

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 000000000000..8de08ec38637
--- /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 dbe2fbaf0796..7264ad616700 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -776,6 +776,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;
         }
     }