Issues/88027: A potential double free in list_sort_impl (GH-92367)

merge_freemem(): set keys to NULL do it's harmless to call this again.
(cherry picked from commit 9652900969)

Co-authored-by: Tim Peters <tim.peters@gmail.com>
This commit is contained in:
Miss Islington (bot) 2022-05-05 21:38:14 -07:00 committed by GitHub
parent 2a2421e538
commit 0eef443f01
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1548,8 +1548,10 @@ static void
merge_freemem(MergeState *ms)
{
assert(ms != NULL);
if (ms->a.keys != ms->temparray)
if (ms->a.keys != ms->temparray) {
PyMem_Free(ms->a.keys);
ms->a.keys = NULL;
}
}
/* Ensure enough temp memory for 'need' array slots is available.