mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-17 01:25:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Replace INT_MAX with PY_SSIZE_T_MAX.

Browse source
This commit is contained in:
Martin v. Löwis 2006-04-13 07:52:27 +00:00
parent 2a19074a9c
commit b1ed7fac12
5 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Modules/functionalmodule.c
View file

@ -48,7 +48,7 @@ partial_new(PyTypeObject *type, PyObject *args, PyObject *kw)
pto->fn = func; pto->fn = func;
Py_INCREF(func); Py_INCREF(func);
pto->args = PyTuple_GetSlice(args, 1, INT_MAX); pto->args = PyTuple_GetSlice(args, 1, PY_SSIZE_T_MAX);
if (pto->args == NULL) { if (pto->args == NULL) {
pto->kw = NULL; pto->kw = NULL;
Py_DECREF(pto); Py_DECREF(pto);

4
Objects/listobject.c
View file

@ -181,7 +181,7 @@ ins1(PyListObject *self, Py_ssize_t where, PyObject *v)
PyErr_BadInternalCall(); PyErr_BadInternalCall();
return -1; return -1;
} }
if (n == INT_MAX) { if (n == PY_SSIZE_T_MAX) {
PyErr_SetString(PyExc_OverflowError, PyErr_SetString(PyExc_OverflowError,
"cannot add more objects to list"); "cannot add more objects to list");
return -1; return -1;
@ -221,7 +221,7 @@ app1(PyListObject *self, PyObject *v)
Py_ssize_t n = PyList_GET_SIZE(self); Py_ssize_t n = PyList_GET_SIZE(self);
assert (v != NULL); assert (v != NULL);
if (n == INT_MAX) { if (n == PY_SSIZE_T_MAX) {
PyErr_SetString(PyExc_OverflowError, PyErr_SetString(PyExc_OverflowError,
"cannot add more objects to list"); "cannot add more objects to list");
return -1; return -1;

5
Python/bltinmodule.c
View file

@ -1746,14 +1746,13 @@ builtin_raw_input(PyObject *self, PyObject *args)
} }
else { /* strip trailing '\n' */ else { /* strip trailing '\n' */
size_t len = strlen(s); size_t len = strlen(s);
if (len > INT_MAX) { if (len > PY_SSIZE_T_MAX) {
PyErr_SetString(PyExc_OverflowError, PyErr_SetString(PyExc_OverflowError,
"[raw_]input: input too long"); "[raw_]input: input too long");
result = NULL; result = NULL;
} }
else { else {
result = PyString_FromStringAndSize(s, result = PyString_FromStringAndSize(s, len-1);
(int)(len-1));
} }
} }
PyMem_FREE(s); PyMem_FREE(s);

4
Python/codecs.c
View file

@ -56,12 +56,12 @@ PyObject *normalizestring(const char *string)
char *p; char *p;
PyObject *v; PyObject *v;
if (len > INT_MAX) { if (len > PY_SSIZE_T_MAX) {
PyErr_SetString(PyExc_OverflowError, "string is too large"); PyErr_SetString(PyExc_OverflowError, "string is too large");
return NULL; return NULL;
} }
v = PyString_FromStringAndSize(NULL, (int)len); v = PyString_FromStringAndSize(NULL, len);
if (v == NULL) if (v == NULL)
return NULL; return NULL;
p = PyString_AS_STRING(v); p = PyString_AS_STRING(v);

2
Python/modsupport.c
View file

@ -407,7 +407,7 @@ do_mkvalue(const char **p_format, va_list *p_va)
else { else {
if (n < 0) { if (n < 0) {
size_t m = strlen(str); size_t m = strlen(str);
if (m > INT_MAX) { if (m > PY_SSIZE_T_MAX) {
PyErr_SetString(PyExc_OverflowError, PyErr_SetString(PyExc_OverflowError,
"string too long for Python string"); "string too long for Python string");
return NULL; return NULL;