don't ignore exceptions from PyObject_IsTrue

benjaminp · benjaminp · commit de73c4587f66 · 2010-07-07T18:54:59.000Z
diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py
@@ -475,6 +475,9 @@ def test_unpack_with_buffer(self):
             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
@@ -503,6 +506,9 @@ def test_bool(self):
                 self.assertFalse(prefix, msg='encoded bool is not one byte: %r'
                                              %packed)
 
+            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])
 
diff --git a/Modules/_struct.c b/Modules/_struct.c
@@ -591,9 +591,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;
 }
 
@@ -865,6 +869,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;
 }

Original file line number	Diff line number	Diff line change
`@@ -591,9 +591,13 @@ np_ulonglong(char p, PyObject v, const formatdef *f)`
`591`	`591`	`static int`
`592`	`592`	`np_bool(char p, PyObject v, const formatdef *f)`
`593`	`593`	`{`
`594`		`- BOOL_TYPE y;`
	`594`	`+ int y;`
	`595`	`+ BOOL_TYPE x;`
`595`	`596`	`y = PyObject_IsTrue(v);`
`596`		`- memcpy(p, (char *)&y, sizeof y);`
	`597`	`+ if (y < 0)`
	`598`	`+ return -1;`
	`599`	`+ x = y;`
	`600`	`+ memcpy(p, (char *)&x, sizeof x);`
`597`	`601`	`return 0;`
`598`	`602`	`}`
`599`	`603`
`@@ -865,6 +869,8 @@ bp_bool(char p, PyObject v, const formatdef *f)`
`865`	`869`	`{`
`866`	`870`	`char y;`
`867`	`871`	`y = PyObject_IsTrue(v);`
	`872`	`+ if (y < 0)`
	`873`	`+ return -1;`
`868`	`874`	`memcpy(p, (char *)&y, sizeof y);`
`869`	`875`	`return 0;`
`870`	`876`	`}`