From: Mark Dickinson <dickinsm@gmail.com>
Date: Sat, 13 Mar 2010 14:18:34 +0000 (+0000)
Subject: Fix incorrect error checks in structmember.c (backport of r78920 from py3k).
X-Git-Tag: v2.7b1~368
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f1ff88f0e4e803fac33b98da7af7cb6c3d8fb917;p=python

Fix incorrect error checks in structmember.c (backport of r78920 from py3k).
---

diff --git a/Python/structmember.c b/Python/structmember.c
index 9f87c076e3..d2d827341b 100644
--- a/Python/structmember.c
+++ b/Python/structmember.c
@@ -257,12 +257,13 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v)
 		}
 	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");
@@ -286,7 +287,7 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v)
 			   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");