[Python-checkins] bpo-46280: Fix tracemalloc_copy_domain() (GH-30591)

miss-islington webhook-mailer at python.org
Thu Jan 13 23:35:26 EST 2022


https://github.com/python/cpython/commit/ae6e255cb362557ff713ff2967aecb92f7eb069c
commit: ae6e255cb362557ff713ff2967aecb92f7eb069c
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-01-13T20:35:21-08:00
summary:

bpo-46280: Fix tracemalloc_copy_domain() (GH-30591)


Test if tracemalloc_copy_traces() failed to allocated memory in
tracemalloc_copy_domain().
(cherry picked from commit 7c770d3350813a82a639fcb3babae0de2b87aaae)

Co-authored-by: Victor Stinner <vstinner at python.org>

files:
M Modules/_tracemalloc.c

diff --git a/Modules/_tracemalloc.c b/Modules/_tracemalloc.c
index 90498fb7a7897..ba0eb738abcbc 100644
--- a/Modules/_tracemalloc.c
+++ b/Modules/_tracemalloc.c
@@ -1241,6 +1241,9 @@ tracemalloc_copy_domain(_Py_hashtable_t *domains,
     _Py_hashtable_t *traces = (_Py_hashtable_t *)value;
 
     _Py_hashtable_t *traces2 = tracemalloc_copy_traces(traces);
+    if (traces2 == NULL) {
+        return -1;
+    }
     if (_Py_hashtable_set(domains2, TO_PTR(domain), traces2) < 0) {
         _Py_hashtable_destroy(traces2);
         return -1;



More information about the Python-checkins mailing list