From: Georg Brandl <georg@python.org>
Date: Thu, 8 Jun 2006 13:31:07 +0000 (+0000)
Subject: Argh. "integer" is a very confusing word ;)
X-Git-Tag: v2.5b1~194
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=98251f8a2f169d5fd1b6ae0fc9c020d00ec74df5;p=python

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".
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 19664a2344..d54806a9af 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -213,9 +213,6 @@ What's New in Python 2.5 alpha 2?
 Core and builtins
 -----------------
 
-- Bug #1502750: Check bounds integer arguments correctly on 64-bit
-  platforms.
-
 - Bug #1465834: 'bdist_wininst preinstall script support' was fixed
   by converting these apis from macros into exported functions again:
 
diff --git a/Python/getargs.c b/Python/getargs.c
index 727376d640..1552790ef0 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -624,12 +624,12 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
 		ival = PyInt_AsLong(arg);
 		if (ival == -1 && PyErr_Occurred())
 			return converterr("integer<i>", arg, msgbuf, bufsize);
-		else if (ival > LONG_MAX) {
+		else if (ival > INT_MAX) {
 			PyErr_SetString(PyExc_OverflowError,
 				"signed integer is greater than maximum");
 			return converterr("integer<i>", arg, msgbuf, bufsize);
 		}
-		else if (ival < LONG_MIN) {
+		else if (ival < INT_MIN) {
 			PyErr_SetString(PyExc_OverflowError,
 				"signed integer is less than minimum");
 			return converterr("integer<i>", arg, msgbuf, bufsize);