From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Thu, 6 Jan 2022 15:52:21 +0000 (-0800)
Subject: [3.9] bpo-46263: FreeBSD 14.0 jemalloc workaround for junk bytes of freed memory... 
X-Git-Tag: v3.9.10~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b259015c1079744dbe3d58bd4c27757a6df9d1c6;p=thirdparty%2FPython%2Fcpython.git

[3.9] bpo-46263: FreeBSD 14.0 jemalloc workaround for junk bytes of freed memory (GH-30434) (GH-30437)

Co-authored-by: Christian Heimes <christian@python.org>
---

diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py
index 87f327414b54..72c648f54d8b 100644
--- a/Lib/test/test_capi.py
+++ b/Lib/test/test_capi.py
@@ -763,8 +763,13 @@ class PyMemDebugTests(unittest.TestCase):
 
     def check(self, code):
         with support.SuppressCrashReport():
-            out = assert_python_failure('-c', code,
-                                        PYTHONMALLOC=self.PYTHONMALLOC)
+            out = assert_python_failure(
+                '-c', code,
+                PYTHONMALLOC=self.PYTHONMALLOC,
+                # FreeBSD: instruct jemalloc to not fill freed() memory
+                # with junk byte 0x5a, see JEMALLOC(3)
+                MALLOC_CONF="junk:false",
+            )
         stderr = out.err
         return stderr.decode('ascii', 'replace')
 
diff --git a/Misc/NEWS.d/next/Tests/2022-01-06-15-45-34.bpo-46263.bJXek6.rst b/Misc/NEWS.d/next/Tests/2022-01-06-15-45-34.bpo-46263.bJXek6.rst
new file mode 100644
index 000000000000..0334af4e3cbe
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2022-01-06-15-45-34.bpo-46263.bJXek6.rst
@@ -0,0 +1,2 @@
+Fix test_capi on FreeBSD 14-dev: instruct jemalloc to not fill freed memory
+with junk byte.