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

miss-islington · methane · web-flow · commit 2350a4765265 · 2018-04-06T00:37:03.000-07:00
(cherry picked from commit 0c1c456) 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
@@ -0,0 +1 @@
+Fix potential memory leak in ``normalizestring()``.
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix potential memory leak in ``normalizestring()``.
Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,6 @@ PyObject normalizestring(const char string)`
`77`	`77`	`}`
`78`	`78`	`p[i] = '\0';`
`79`	`79`	`v = PyUnicode_FromString(p);`
`80`		`- if (v == NULL)`
`81`		`- return NULL;`
`82`	`80`	`PyMem_Free(p);`
`83`	`81`	`return v;`
`84`	`82`	`}`