From 22cf6a2f2347b7d4f11e45e557beace55acc79b5 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Sat, 2 Oct 2021 06:21:55 -0700 Subject: bpo-45329: Fix freed memory access in pyexpat.c (GH-28649) (cherry picked from commit 0742abdc48886b74ed3b66985a54bb1c32802670) Co-authored-by: TAGAMI Yukihiro --- Misc/NEWS.d/next/Library/2021-10-01-13-09-53.bpo-45329.9iMYaO.rst | 2 ++ Modules/pyexpat.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Library/2021-10-01-13-09-53.bpo-45329.9iMYaO.rst diff --git a/Misc/NEWS.d/next/Library/2021-10-01-13-09-53.bpo-45329.9iMYaO.rst b/Misc/NEWS.d/next/Library/2021-10-01-13-09-53.bpo-45329.9iMYaO.rst new file mode 100644 index 0000000..b4bedbc --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-10-01-13-09-53.bpo-45329.9iMYaO.rst @@ -0,0 +1,2 @@ +Fix freed memory access in :class:`pyexpat.xmlparser` when building it with an +installed expat library <= 2.2.0. diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c index ec68463..b3d9bdd 100644 --- a/Modules/pyexpat.c +++ b/Modules/pyexpat.c @@ -1204,10 +1204,10 @@ static void xmlparse_dealloc(xmlparseobject *self) { PyObject_GC_UnTrack(self); + (void)xmlparse_clear(self); if (self->itself != NULL) XML_ParserFree(self->itself); self->itself = NULL; - (void)xmlparse_clear(self); if (self->handlers != NULL) { PyMem_Free(self->handlers); -- cgit v0.12