fix a struct regression where long would be returned for short unsigned integers

3b0cae9c · Bob Ippolito · 3fc2bb9c · 3b0cae9c
Commit 3b0cae9c authored May 25, 2006 by Bob Ippolito
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

Modules/_struct.c Modules/_struct.c +6 -0

No files found.
--- a/Modules/_struct.c
+++ b/Modules/_struct.c
@@ -609,6 +609,9 @@ bu_uint(const char *p, const formatdef *f)
 #ifdef PY_USE_INT_WHEN_POSSIBLE
 	if (x <= INT_MAX)
 		return PyInt_FromLong((long)x);
+#else
+	if (SIZEOF_LONG > f->size)
+		return PyInt_FromLong((long)x);
 #endif
 	return PyLong_FromUnsignedLong(x);
 }
@@ -805,6 +808,9 @@ lu_uint(const char *p, const formatdef *f)
 #ifdef PY_USE_INT_WHEN_POSSIBLE
 	if (x <= INT_MAX)
 		return PyInt_FromLong((long)x);
+#else
+	if (SIZEOF_LONG > f->size)
+		return PyInt_FromLong((long)x);
 #endif
 	return PyLong_FromUnsignedLong((long)x);
 }