mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-27 05:44:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Use LONG_MIN and LONG_MAX to check Python integer bounds instead of the incorrect INT_MIN and INT_MAX

Browse source
This commit is contained in:
Bob Ippolito 2006-05-25 19:33:38 +00:00
parent 554da412a8
commit 04ab994dca
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Modules/_struct.c
View file

@ -291,7 +291,7 @@ nu_uint(const char *p, const formatdef *f)
unsigned int x; unsigned int x;
memcpy((char *)&x, p, sizeof x); memcpy((char *)&x, p, sizeof x);
#ifdef PY_USE_INT_WHEN_POSSIBLE #ifdef PY_USE_INT_WHEN_POSSIBLE
if (x <= INT_MAX) if (x <= LONG_MAX)
return PyInt_FromLong((long)x); return PyInt_FromLong((long)x);
#endif #endif
return PyLong_FromUnsignedLong((unsigned long)x); return PyLong_FromUnsignedLong((unsigned long)x);
@ -311,7 +311,7 @@ nu_ulong(const char *p, const formatdef *f)
unsigned long x; unsigned long x;
memcpy((char *)&x, p, sizeof x); memcpy((char *)&x, p, sizeof x);
#ifdef PY_USE_INT_WHEN_POSSIBLE #ifdef PY_USE_INT_WHEN_POSSIBLE
if (x <= INT_MAX) if (x <= LONG_MAX)
return PyInt_FromLong((long)x); return PyInt_FromLong((long)x);
#endif #endif
return PyLong_FromUnsignedLong(x); return PyLong_FromUnsignedLong(x);
@ -328,7 +328,7 @@ nu_longlong(const char *p, const formatdef *f)
PY_LONG_LONG x; PY_LONG_LONG x;
memcpy((char *)&x, p, sizeof x); memcpy((char *)&x, p, sizeof x);
#ifdef PY_USE_INT_WHEN_POSSIBLE #ifdef PY_USE_INT_WHEN_POSSIBLE
if (x >= INT_MIN && x <= INT_MAX) if (x >= LONG_MIN && x <= LONG_MAX)
return PyInt_FromLong(Py_SAFE_DOWNCAST(x, PY_LONG_LONG, long)); return PyInt_FromLong(Py_SAFE_DOWNCAST(x, PY_LONG_LONG, long));
#endif #endif
return PyLong_FromLongLong(x); return PyLong_FromLongLong(x);
@ -340,7 +340,7 @@ nu_ulonglong(const char *p, const formatdef *f)
unsigned PY_LONG_LONG x; unsigned PY_LONG_LONG x;
memcpy((char *)&x, p, sizeof x); memcpy((char *)&x, p, sizeof x);
#ifdef PY_USE_INT_WHEN_POSSIBLE #ifdef PY_USE_INT_WHEN_POSSIBLE
if (x <= INT_MAX) if (x <= LONG_MAX)
return PyInt_FromLong(Py_SAFE_DOWNCAST(x, unsigned PY_LONG_LONG, long)); return PyInt_FromLong(Py_SAFE_DOWNCAST(x, unsigned PY_LONG_LONG, long));
#endif #endif
return PyLong_FromUnsignedLongLong(x); return PyLong_FromUnsignedLongLong(x);
@ -607,7 +607,7 @@ bu_uint(const char *p, const formatdef *f)
x = (x<<8) | (*p++ & 0xFF); x = (x<<8) | (*p++ & 0xFF);
} while (--i > 0); } while (--i > 0);
#ifdef PY_USE_INT_WHEN_POSSIBLE #ifdef PY_USE_INT_WHEN_POSSIBLE
if (x <= INT_MAX) if (x <= LONG_MAX)
return PyInt_FromLong((long)x); return PyInt_FromLong((long)x);
#else #else
if (SIZEOF_LONG > f->size) if (SIZEOF_LONG > f->size)
@ -629,7 +629,7 @@ bu_longlong(const char *p, const formatdef *f)
if (SIZEOF_LONG_LONG > f->size) if (SIZEOF_LONG_LONG > f->size)
x |= -(x & (1L << (8 * f->size - 1))); x |= -(x & (1L << (8 * f->size - 1)));
#ifdef PY_USE_INT_WHEN_POSSIBLE #ifdef PY_USE_INT_WHEN_POSSIBLE
if (x >= INT_MIN && x <= INT_MAX) if (x >= LONG_MIN && x <= LONG_MAX)
return PyInt_FromLong(Py_SAFE_DOWNCAST(x, PY_LONG_LONG, long)); return PyInt_FromLong(Py_SAFE_DOWNCAST(x, PY_LONG_LONG, long));
#endif #endif
return PyLong_FromLongLong(x); return PyLong_FromLongLong(x);
@ -651,7 +651,7 @@ bu_ulonglong(const char *p, const formatdef *f)
x = (x<<8) | (*p++ & 0xFF); x = (x<<8) | (*p++ & 0xFF);
} while (--i > 0); } while (--i > 0);
#ifdef PY_USE_INT_WHEN_POSSIBLE #ifdef PY_USE_INT_WHEN_POSSIBLE
if (x <= INT_MAX) if (x <= LONG_MAX)
return PyInt_FromLong(Py_SAFE_DOWNCAST(x, unsigned PY_LONG_LONG, long)); return PyInt_FromLong(Py_SAFE_DOWNCAST(x, unsigned PY_LONG_LONG, long));
#endif #endif
return PyLong_FromUnsignedLongLong(x); return PyLong_FromUnsignedLongLong(x);
@ -806,7 +806,7 @@ lu_uint(const char *p, const formatdef *f)
x = (x<<8) | (p[--i] & 0xFF); x = (x<<8) | (p[--i] & 0xFF);
} while (i > 0); } while (i > 0);
#ifdef PY_USE_INT_WHEN_POSSIBLE #ifdef PY_USE_INT_WHEN_POSSIBLE
if (x <= INT_MAX) if (x <= LONG_MAX)
return PyInt_FromLong((long)x); return PyInt_FromLong((long)x);
#else #else
if (SIZEOF_LONG > f->size) if (SIZEOF_LONG > f->size)
@ -828,7 +828,7 @@ lu_longlong(const char *p, const formatdef *f)
if (SIZEOF_LONG_LONG > f->size) if (SIZEOF_LONG_LONG > f->size)
x |= -(x & (1L << (8 * f->size - 1))); x |= -(x & (1L << (8 * f->size - 1)));
#ifdef PY_USE_INT_WHEN_POSSIBLE #ifdef PY_USE_INT_WHEN_POSSIBLE
if (x >= INT_MIN && x <= INT_MAX) if (x >= LONG_MIN && x <= LONG_MAX)
return PyInt_FromLong(Py_SAFE_DOWNCAST(x, PY_LONG_LONG, long)); return PyInt_FromLong(Py_SAFE_DOWNCAST(x, PY_LONG_LONG, long));
#endif #endif
return PyLong_FromLongLong(x); return PyLong_FromLongLong(x);
@ -850,7 +850,7 @@ lu_ulonglong(const char *p, const formatdef *f)
x = (x<<8) | (p[--i] & 0xFF); x = (x<<8) | (p[--i] & 0xFF);
} while (i > 0); } while (i > 0);
#ifdef PY_USE_INT_WHEN_POSSIBLE #ifdef PY_USE_INT_WHEN_POSSIBLE
if (x <= INT_MAX) if (x <= LONG_MAX)
return PyInt_FromLong(Py_SAFE_DOWNCAST(x, unsigned PY_LONG_LONG, long)); return PyInt_FromLong(Py_SAFE_DOWNCAST(x, unsigned PY_LONG_LONG, long));
#endif #endif
return PyLong_FromUnsignedLongLong(x); return PyLong_FromUnsignedLongLong(x);
@ -1477,14 +1477,17 @@ init_struct(void)
if (PyType_Ready(&PyStructType) < 0) if (PyType_Ready(&PyStructType) < 0)
return; return;
/* Add some symbolic constants to the module */ /* Add some symbolic constants to the module */
if (StructError == NULL) { if (StructError == NULL) {
StructError = PyErr_NewException("struct.error", NULL, NULL); StructError = PyErr_NewException("struct.error", NULL, NULL);
if (StructError == NULL) if (StructError == NULL)
return; return;
} }
Py_INCREF(StructError); Py_INCREF(StructError);
PyModule_AddObject(m, "error", StructError); PyModule_AddObject(m, "error", StructError);
Py_INCREF((PyObject*)&PyStructType); Py_INCREF((PyObject*)&PyStructType);
PyModule_AddObject(m, "Struct", (PyObject*)&PyStructType); PyModule_AddObject(m, "Struct", (PyObject*)&PyStructType);
} }