mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-17 20:28:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Make int("...") return a long if an int would overflow.

Browse source 
Also remove the 512 character limitation for int(u"...") and long(u"...").

This closes SF bug #629989.
This commit is contained in:
Walter Dörwald 2002-11-06 16:15:14 +00:00
parent aca49b065b
commit 07e147667c
3 changed files with 31 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Objects/intobject.c
View file

@ -208,10 +208,9 @@ PyInt_FromString(char *s, char **pend, int base)
return NULL;
}
else if (errno != 0) {
PyOS_snprintf(buffer, sizeof(buffer),
"int() literal too large: %.200s", s);
PyErr_SetString(PyExc_ValueError, buffer);
return NULL;
if (err_ovf("string/unicode conversion"))
return NULL;
return PyLong_FromString(s, pend, base);
}
if (pend)
*pend = end;
@ -222,16 +221,19 @@ PyInt_FromString(char *s, char **pend, int base)
PyObject *
PyInt_FromUnicode(Py_UNICODE *s, int length, int base)
{
char buffer[256];
PyObject *result;
char *buffer = PyMem_MALLOC(length+1);
if (length >= sizeof(buffer)) {
PyErr_SetString(PyExc_ValueError,
"int() literal too large to convert");
if (buffer == NULL)
return NULL;
if (PyUnicode_EncodeDecimal(s, length, buffer, NULL)) {
PyMem_FREE(buffer);
return NULL;
}
if (PyUnicode_EncodeDecimal(s, length, buffer, NULL))
return NULL;
return PyInt_FromString(buffer, NULL, base);
result = PyInt_FromString(buffer, NULL, base);
PyMem_FREE(buffer);
return result;
}
#endif