mirror of https://github.com/python/cpython
Replace INT_MAX with PY_SSIZE_T_MAX.
This commit is contained in:
parent
2a19074a9c
commit
b1ed7fac12
|
@ -48,7 +48,7 @@ partial_new(PyTypeObject *type, PyObject *args, PyObject *kw)
|
|||
|
||||
pto->fn = 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) {
|
||||
pto->kw = NULL;
|
||||
Py_DECREF(pto);
|
||||
|
|
|
@ -181,7 +181,7 @@ ins1(PyListObject *self, Py_ssize_t where, PyObject *v)
|
|||
PyErr_BadInternalCall();
|
||||
return -1;
|
||||
}
|
||||
if (n == INT_MAX) {
|
||||
if (n == PY_SSIZE_T_MAX) {
|
||||
PyErr_SetString(PyExc_OverflowError,
|
||||
"cannot add more objects to list");
|
||||
return -1;
|
||||
|
@ -221,7 +221,7 @@ app1(PyListObject *self, PyObject *v)
|
|||
Py_ssize_t n = PyList_GET_SIZE(self);
|
||||
|
||||
assert (v != NULL);
|
||||
if (n == INT_MAX) {
|
||||
if (n == PY_SSIZE_T_MAX) {
|
||||
PyErr_SetString(PyExc_OverflowError,
|
||||
"cannot add more objects to list");
|
||||
return -1;
|
||||
|
|
|
@ -1746,14 +1746,13 @@ builtin_raw_input(PyObject *self, PyObject *args)
|
|||
}
|
||||
else { /* strip trailing '\n' */
|
||||
size_t len = strlen(s);
|
||||
if (len > INT_MAX) {
|
||||
if (len > PY_SSIZE_T_MAX) {
|
||||
PyErr_SetString(PyExc_OverflowError,
|
||||
"[raw_]input: input too long");
|
||||
result = NULL;
|
||||
}
|
||||
else {
|
||||
result = PyString_FromStringAndSize(s,
|
||||
(int)(len-1));
|
||||
result = PyString_FromStringAndSize(s, len-1);
|
||||
}
|
||||
}
|
||||
PyMem_FREE(s);
|
||||
|
|
|
@ -56,12 +56,12 @@ PyObject *normalizestring(const char *string)
|
|||
char *p;
|
||||
PyObject *v;
|
||||
|
||||
if (len > INT_MAX) {
|
||||
PyErr_SetString(PyExc_OverflowError, "string is too large");
|
||||
return NULL;
|
||||
}
|
||||
if (len > PY_SSIZE_T_MAX) {
|
||||
PyErr_SetString(PyExc_OverflowError, "string is too large");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
v = PyString_FromStringAndSize(NULL, (int)len);
|
||||
v = PyString_FromStringAndSize(NULL, len);
|
||||
if (v == NULL)
|
||||
return NULL;
|
||||
p = PyString_AS_STRING(v);
|
||||
|
|
|
@ -407,7 +407,7 @@ do_mkvalue(const char **p_format, va_list *p_va)
|
|||
else {
|
||||
if (n < 0) {
|
||||
size_t m = strlen(str);
|
||||
if (m > INT_MAX) {
|
||||
if (m > PY_SSIZE_T_MAX) {
|
||||
PyErr_SetString(PyExc_OverflowError,
|
||||
"string too long for Python string");
|
||||
return NULL;
|
||||
|
|
Loading…
Reference in New Issue