From: Sergey B Kirpichev <skirpichev@gmail.com>
Date: Thu, 10 Oct 2024 14:56:49 +0000 (+0300)
Subject: [3.12] gh-125118: don't copy arbitrary values to _Bool in the struct module (GH-12516... 
X-Git-Tag: v3.12.8~234
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=67f8302b9c94079f73dba23eaa47443fcb6008ad;p=thirdparty%2FPython%2Fcpython.git

[3.12] gh-125118: don't copy arbitrary values to _Bool in the struct module (GH-125169) (#125265)

memcopy'ing arbitrary values to _Bool variable triggers undefined
behaviour. Avoid this.
We assume that `false` is represented by all zero bytes.

Credits to Alex Gaynor.

(cherry picked from commit 87d7315ac57250046372b0d9ae4619ba619c8c87)

Co-authored-by: Sam Gross <colesbury@gmail.com>
Co-authored-by: Victor Stinner <vstinner@python.org>
Co-authored-by: Petr Viktorin <encukou@gmail.com>
---

diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py
index 39ca78cece1f..c683e5dd6c47 100644
--- a/Lib/test/test_struct.py
+++ b/Lib/test/test_struct.py
@@ -529,6 +529,9 @@ class StructTest(unittest.TestCase):
 
         for c in [b'\x01', b'\x7f', b'\xff', b'\x0f', b'\xf0']:
             self.assertTrue(struct.unpack('>?', c)[0])
+            self.assertTrue(struct.unpack('<?', c)[0])
+            self.assertTrue(struct.unpack('=?', c)[0])
+            self.assertTrue(struct.unpack('@?', c)[0])
 
     def test_count_overflow(self):
         hugecount = '{}b'.format(sys.maxsize+1)
diff --git a/Misc/NEWS.d/next/Library/2024-10-09-07-09-00.gh-issue-125118.J9rQ1S.rst b/Misc/NEWS.d/next/Library/2024-10-09-07-09-00.gh-issue-125118.J9rQ1S.rst
new file mode 100644
index 000000000000..5d57cdbbbc2f
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-10-09-07-09-00.gh-issue-125118.J9rQ1S.rst
@@ -0,0 +1 @@
+Don't copy arbitrary values to :c:expr:`_Bool` in the :mod:`struct` module.
diff --git a/Modules/_struct.c b/Modules/_struct.c
index 84474043b01b..6532174a0b17 100644
--- a/Modules/_struct.c
+++ b/Modules/_struct.c
@@ -483,9 +483,8 @@ nu_ulonglong(_structmodulestate *state, const char *p, const formatdef *f)
 static PyObject *
 nu_bool(_structmodulestate *state, const char *p, const formatdef *f)
 {
-    _Bool x;
-    memcpy((char *)&x, p, sizeof x);
-    return PyBool_FromLong(x != 0);
+    const _Bool bool_false = 0;
+    return PyBool_FromLong(memcmp(p, &bool_false, sizeof(_Bool)));
 }