diff options
| -rw-r--r-- | Lib/test/test_struct.py | 10 | ||||
| -rw-r--r-- | Modules/_struct.c | 10 |
2 files changed, 16 insertions, 4 deletions
diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py index 6032895..8840462 100644 --- a/Lib/test/test_struct.py +++ b/Lib/test/test_struct.py @@ -480,6 +480,9 @@ class StructTest(unittest.TestCase): self.assertEqual(value, 0x12345678) def test_bool(self): + class ExplodingBool(object): + def __bool__(self): + raise IOError for prefix in tuple("<>!=")+('',): false = (), [], [], '', 0 true = [1], 'test', 5, -1, 0xffffffff+1, 0xffffffff/2 @@ -508,8 +511,11 @@ class StructTest(unittest.TestCase): self.assertFalse(prefix, msg='encoded bool is not one byte: %r' %packed) - for c in [b'\x01', b'\x7f', b'\xff', b'\x0f', b'\xf0']: - self.assertTrue(struct.unpack('>?', c)[0]) + self.assertRaises(IOError, struct.pack, prefix + '?', + ExplodingBool()) + + for c in [b'\x01', b'\x7f', b'\xff', b'\x0f', b'\xf0']: + self.assertTrue(struct.unpack('>?', c)[0]) def test_count_overflow(self): hugecount = '{}b'.format(sys.maxsize+1) diff --git a/Modules/_struct.c b/Modules/_struct.c index f629817..ba8a8ed 100644 --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -580,9 +580,13 @@ np_ulonglong(char *p, PyObject *v, const formatdef *f) static int np_bool(char *p, PyObject *v, const formatdef *f) { - BOOL_TYPE y; + int y; + BOOL_TYPE x; y = PyObject_IsTrue(v); - memcpy(p, (char *)&y, sizeof y); + if (y < 0) + return -1; + x = y; + memcpy(p, (char *)&x, sizeof x); return 0; } @@ -854,6 +858,8 @@ bp_bool(char *p, PyObject *v, const formatdef *f) { char y; y = PyObject_IsTrue(v); + if (y < 0) + return -1; memcpy(p, (char *)&y, sizeof y); return 0; } |