summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorINADA Naoki <methane@users.noreply.github.com>2018-04-06 06:51:24 (GMT)
committerGitHub <noreply@github.com>2018-04-06 06:51:24 (GMT)
commit0c1c4563a65ac451021d927058e4f25013934eb2 (patch)
tree144630102850a416a8572266e1466bf875f186d1
parent01b731fc2b04744a11e32f93aba8bfb9ddb3dd29 (diff)
downloadcpython-0c1c4563a65ac451021d927058e4f25013934eb2.zip
cpython-0c1c4563a65ac451021d927058e4f25013934eb2.tar.gz
cpython-0c1c4563a65ac451021d927058e4f25013934eb2.tar.bz2
bpo-33231: Fix potential leak in normalizestring() (GH-6386)
-rw-r--r--Misc/NEWS.d/next/Core and Builtins/2018-04-05-22-20-44.bpo-33231.3Jmo0q.rst1
-rw-r--r--Python/codecs.c2
2 files changed, 1 insertions, 2 deletions
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 0000000..de54fbb
--- /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 223ccca..eb3cd35 100644
--- 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;
}