Mercurial > cpython-lru_cache-weakref
diff Python/structmember.c @ 59580:a7b58f1e8af0
Issue #8014: Fix incorrect error checks in structmember.c, and re-enable
previously failing test_structmember.py tests.
| author | Mark Dickinson <dickinsm@gmail.com> |
|---|---|
| date | Sat, 13 Mar 2010 13:23:05 +0000 |
| parents | 46f4b7b5b4dd |
| children | fa641d605468 |
line wrap: on
line diff
--- a/Python/structmember.c Sat Mar 13 11:34:40 2010 +0000 +++ b/Python/structmember.c Sat Mar 13 13:23:05 2010 +0000 @@ -187,12 +187,13 @@ } case T_UINT:{ unsigned long ulong_val = PyLong_AsUnsignedLong(v); - if ((ulong_val == (unsigned int)-1) && PyErr_Occurred()) { + if ((ulong_val == (unsigned long)-1) && PyErr_Occurred()) { /* XXX: For compatibility, accept negative int values as well. */ PyErr_Clear(); ulong_val = PyLong_AsLong(v); - if ((ulong_val == (unsigned int)-1) && PyErr_Occurred()) + if ((ulong_val == (unsigned long)-1) && + PyErr_Occurred()) return -1; *(unsigned int *)addr = (unsigned int)ulong_val; WARN("Writing negative value into unsigned field"); @@ -216,7 +217,7 @@ as well. */ PyErr_Clear(); *(unsigned long*)addr = PyLong_AsLong(v); - if ((*(unsigned long*)addr == (unsigned int)-1) + if ((*(unsigned long*)addr == (unsigned long)-1) && PyErr_Occurred()) return -1; WARN("Writing negative value into unsigned field");