From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 6 Apr 2018 07:37:03 +0000 (-0700)
Subject: bpo-33231: Fix potential leak in normalizestring() (GH-6386)
X-Git-Tag: v3.6.6rc1~197
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2350a4765265158072bf7ad9f04402406d3d1ada;p=python

bpo-33231: Fix potential leak in normalizestring() (GH-6386)

(cherry picked from commit 0c1c4563a65ac451021d927058e4f25013934eb2)

Co-authored-by: INADA Naoki <methane@users.noreply.github.com>
---

diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-04-05-22-20-44.bpo-33231.3Jmo0q.rst b/Misc/NEWS.d/next/Core and Builtins/2018-04-05-22-20-44.bpo-33231.3Jmo0q.rst
new file mode 100644
index 0000000000..de54fbb526
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2018-04-05-22-20-44.bpo-33231.3Jmo0q.rst	
@@ -0,0 +1 @@
+Fix potential memory leak in ``normalizestring()``.
diff --git a/Python/codecs.c b/Python/codecs.c
index fe57d0dc42..4ff83014d8 100644
--- a/Python/codecs.c
+++ b/Python/codecs.c
@@ -77,8 +77,6 @@ PyObject *normalizestring(const char *string)
     }
     p[i] = '\0';
     v = PyUnicode_FromString(p);
-    if (v == NULL)
-        return NULL;
     PyMem_Free(p);
     return v;
 }