Mercurial > cpython-lru_cache-weakref

diff Modules/_struct.c @ 62848:e7da968e3e5a 2.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged revisions 82628,82630 via svnmerge from 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 ........
author Benjamin Peterson <benjamin@python.org>
date Wed, 07 Jul 2010 19:03:36 +0000
parents 7db7f8442414
children 19191559ec02
line wrap: on
line diff
--- a/Modules/_struct.c	Wed Jul 07 15:51:17 2010 +0000
+++ b/Modules/_struct.c	Wed Jul 07 19:03:36 2010 +0000
@@ -636,9 +636,13 @@
 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;
 }
 
@@ -910,6 +914,8 @@
 {
     char y;
     y = PyObject_IsTrue(v);
+    if (y < 0)
+        return -1;
     memcpy(p, (char *)&y, sizeof y);
     return 0;
 }