Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Argh. "integer" is a very confusing word ;) 

Actually, checking for INT_MAX and INT_MIN is correct since
the format code explicitly handles a C "int".
This commit is contained in:
Georg Brandl 2006-06-08 13:31:07 +00:00
parent c9ae4e8a2d
commit 98251f8a2f
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -213,9 +213,6 @@ What's New in Python 2.5 alpha 2?
Core and builtins Core and builtins
----------------- -----------------
- Bug #1502750: Check bounds integer arguments correctly on 64-bit
platforms.
- Bug #1465834: 'bdist_wininst preinstall script support' was fixed - Bug #1465834: 'bdist_wininst preinstall script support' was fixed
by converting these apis from macros into exported functions again: by converting these apis from macros into exported functions again:

4
Python/getargs.c
View File

@ -624,12 +624,12 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
ival = PyInt_AsLong(arg); ival = PyInt_AsLong(arg);
if (ival == -1 && PyErr_Occurred()) if (ival == -1 && PyErr_Occurred())
return converterr("integer<i>", arg, msgbuf, bufsize); return converterr("integer<i>", arg, msgbuf, bufsize);
else if (ival > LONG_MAX) { else if (ival > INT_MAX) {
PyErr_SetString(PyExc_OverflowError, PyErr_SetString(PyExc_OverflowError,
"signed integer is greater than maximum"); "signed integer is greater than maximum");
return converterr("integer<i>", arg, msgbuf, bufsize); return converterr("integer<i>", arg, msgbuf, bufsize);
} }
else if (ival < LONG_MIN) { else if (ival < INT_MIN) {
PyErr_SetString(PyExc_OverflowError, PyErr_SetString(PyExc_OverflowError,
"signed integer is less than minimum"); "signed integer is less than minimum");
return converterr("integer<i>", arg, msgbuf, bufsize); return converterr("integer<i>", arg, msgbuf, bufsize);