Unsigned 1 and 2 byte sized formats shouldn't result in long integer values!

39ef2274 · Guido van Rossum · c94f16f1 · 39ef2274
Commit 39ef2274 authored Jun 29, 1998 by Guido van Rossum
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

Modules/structmodule.c Modules/structmodule.c +8 -2

No files found.
--- a/Modules/structmodule.c
+++ b/Modules/structmodule.c
@@ -694,7 +694,10 @@ bu_uint(p, f)
 	do {
 		x = (x<<8) | (*p++ & 0xFF);
 	} while (--i > 0);
-	return PyLong_FromUnsignedLong(x);
+	if (f->size >= 4)
+		return PyLong_FromUnsignedLong(x);
+	else
+		return PyInt_FromLong((long)x);
 }

 static PyObject *
@@ -825,7 +828,10 @@ lu_uint(p, f)
 	do {
 		x = (x<<8) | (p[--i] & 0xFF);
 	} while (i > 0);
-	return PyLong_FromUnsignedLong(x);
+	if (f->size >= 4)
+		return PyLong_FromUnsignedLong(x);
+	else
+		return PyInt_FromLong((long)x);
 }

 static PyObject *