From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 14 Jan 2022 04:35:21 +0000 (-0800)
Subject: bpo-46280: Fix tracemalloc_copy_domain() (GH-30591)
X-Git-Tag: v3.9.11~167
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ae6e255cb362557ff713ff2967aecb92f7eb069c;p=thirdparty%2FPython%2Fcpython.git

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@python.org>
---

diff --git a/Modules/_tracemalloc.c b/Modules/_tracemalloc.c
index 90498fb7a789..ba0eb738abcb 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;