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

Check the type of values returned by __int__, __float__, __long__,

Browse source 
__oct__, and __hex__.  Raise TypeError if an invalid type is
returned.  Note that PyNumber_Int and PyNumber_Long can still
return ints or longs.  Fixes SF bug #966618.
This commit is contained in:
Neil Schemenauer 2004-07-19 16:29:17 +00:00
parent 66edb6295f
commit 3a313e3655
5 changed files with 138 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Python/bltinmodule.c
View file

@ -962,6 +962,7 @@ static PyObject *
builtin_hex(PyObject *self, PyObject *v)
{
PyNumberMethods *nb;
PyObject *res;
if ((nb = v->ob_type->tp_as_number) == NULL ||
nb->nb_hex == NULL) {
@ -969,7 +970,15 @@ builtin_hex(PyObject *self, PyObject *v)
"hex() argument can't be converted to hex");
return NULL;
}
return (*nb->nb_hex)(v);
res = (*nb->nb_hex)(v);
if (res && !PyString_Check(res)) {
PyErr_Format(PyExc_TypeError,
"__hex__ returned non-string (type %.200s)",
res->ob_type->tp_name);
Py_DECREF(res);
return NULL;
}
return res;
}
PyDoc_STRVAR(hex_doc,
@ -1178,6 +1187,7 @@ static PyObject *
builtin_oct(PyObject *self, PyObject *v)
{
PyNumberMethods *nb;
PyObject *res;
if (v == NULL || (nb = v->ob_type->tp_as_number) == NULL ||
nb->nb_oct == NULL) {
@ -1185,7 +1195,15 @@ builtin_oct(PyObject *self, PyObject *v)
"oct() argument can't be converted to oct");
return NULL;
}
return (*nb->nb_oct)(v);
res = (*nb->nb_oct)(v);
if (res && !PyString_Check(res)) {
PyErr_Format(PyExc_TypeError,
"__oct__ returned non-string (type %.200s)",
res->ob_type->tp_name);
Py_DECREF(res);
return NULL;
}
return res;
}
PyDoc_STRVAR(oct_doc,