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

diff --git a/Modules/structmodule.c b/Modules/structmodule.c
index d837e02dc0a550bb2f4a0d4550ceb9fd2561c0df..af8f1e53c064ba3b9e718461f98d64450d2e1256 100644 (file)
--- 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 *