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

methane · web-flow · commit 0c1c4563a65a · 2018-04-06T15:51:24.000+09:00
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
@@ -78,8 +78,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
`@@ -78,8 +78,6 @@ PyObject normalizestring(const char string)`
`78`	`78`	`}`
`79`	`79`	`p[i] = '\0';`
`80`	`80`	`v = PyUnicode_FromString(p);`
`81`		`- if (v == NULL)`
`82`		`- return NULL;`
`83`	`81`	`PyMem_Free(p);`
`84`	`82`	`return v;`
`85`	`83`	`}`