mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #8014: Fix PyLong_As<c-integer-type> methods not to produce an

Browse source 
internal error on non-integer input: they now raise TypeError instead.
This is needed for attributes declared via PyMemberDefs.
This commit is contained in:
Mark Dickinson 2010-03-13 11:34:40 +00:00
parent fe427fee6c
commit d59b41641e
4 changed files with 71 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Objects/longobject.c
View file

@ -435,10 +435,15 @@ PyLong_AsSsize_t(PyObject *vv) {
Py_ssize_t i;
int sign;
if (vv == NULL || !PyLong_Check(vv)) {
if (vv == NULL) {
PyErr_BadInternalCall();
return -1;
}
if (!PyLong_Check(vv)) {
PyErr_SetString(PyExc_TypeError, "an integer is required");
return -1;
}
v = (PyLongObject *)vv;
i = Py_SIZE(v);
switch (i) {
@ -485,10 +490,15 @@ PyLong_AsUnsignedLong(PyObject *vv)
unsigned long x, prev;
Py_ssize_t i;
if (vv == NULL || !PyLong_Check(vv)) {
if (vv == NULL) {
PyErr_BadInternalCall();
return (unsigned long) -1;
return (unsigned long)-1;
}
if (!PyLong_Check(vv)) {
PyErr_SetString(PyExc_TypeError, "an integer is required");
return (unsigned long)-1;
}
v = (PyLongObject *)vv;
i = Py_SIZE(v);
x = 0;
@ -523,10 +533,15 @@ PyLong_AsSize_t(PyObject *vv)
size_t x, prev;
Py_ssize_t i;
if (vv == NULL || !PyLong_Check(vv)) {
if (vv == NULL) {
PyErr_BadInternalCall();
return (unsigned long) -1;
return (size_t) -1;
}
if (!PyLong_Check(vv)) {
PyErr_SetString(PyExc_TypeError, "an integer is required");
return (size_t)-1;
}
v = (PyLongObject *)vv;
i = Py_SIZE(v);
x = 0;