mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-30 06:34:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 82628,82630 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82628 | benjamin.peterson | 2010-07-07 13:44:05 -0500 (Wed, 07 Jul 2010) | 1 line

  this needn't be in the loop
........
  r82630 | benjamin.peterson | 2010-07-07 13:54:59 -0500 (Wed, 07 Jul 2010) | 1 line

  don't ignore exceptions from PyObject_IsTrue
........
This commit is contained in:
Benjamin Peterson 2010-07-07 19:03:36 +00:00
parent ba303c82d1
commit 489113fd5f
2 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/test/test_struct.py
View file

@ -491,6 +491,9 @@ class StructTest(unittest.TestCase):
self.test_unpack_from(cls=buffer) self.test_unpack_from(cls=buffer)
def test_bool(self): def test_bool(self):
class ExplodingBool(object):
def __nonzero__(self):
raise IOError
for prefix in tuple("<>!=")+('',): for prefix in tuple("<>!=")+('',):
false = (), [], [], '', 0 false = (), [], [], '', 0
true = [1], 'test', 5, -1, 0xffffffffL+1, 0xffffffff//2 true = [1], 'test', 5, -1, 0xffffffffL+1, 0xffffffff//2
@ -519,8 +522,11 @@ class StructTest(unittest.TestCase):
self.assertFalse(prefix, msg='encoded bool is not one byte: %r' self.assertFalse(prefix, msg='encoded bool is not one byte: %r'
%packed) %packed)
for c in '\x01\x7f\xff\x0f\xf0': self.assertRaises(IOError, struct.pack, prefix + '?',
self.assertTrue(struct.unpack('>?', c)[0]) ExplodingBool())
for c in [b'\x01', b'\x7f', b'\xff', b'\x0f', b'\xf0']:
self.assertTrue(struct.unpack('>?', c)[0])
@unittest.skipUnless(IS32BIT, "Specific to 32bit machines") @unittest.skipUnless(IS32BIT, "Specific to 32bit machines")
def test_crasher(self): def test_crasher(self):

10
Modules/_struct.c
View file

@ -636,9 +636,13 @@ np_ulonglong(char *p, PyObject *v, const formatdef *f)
static int static int
np_bool(char *p, PyObject *v, const formatdef *f) np_bool(char *p, PyObject *v, const formatdef *f)
{ {
BOOL_TYPE y; int y;
BOOL_TYPE x;
y = PyObject_IsTrue(v); 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; return 0;
} }
@ -910,6 +914,8 @@ bp_bool(char *p, PyObject *v, const formatdef *f)
{ {
char y; char y;
y = PyObject_IsTrue(v); y = PyObject_IsTrue(v);
if (y < 0)
return -1;
memcpy(p, (char *)&y, sizeof y); memcpy(p, (char *)&y, sizeof y);
return 0; return 0;
} }