Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

In PyObject_IsTrue(), don't call function pointers that are NULL 

(nb_nonzero, mp_length, sq_length).
This commit is contained in:
Guido van Rossum 1998-05-22 00:53:24 +00:00
parent 7e33c6e896
commit 1c4f458099
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Objects/object.c
View File

@ -469,11 +469,14 @@ PyObject_IsTrue(v)
int res;
if (v == Py_None)
res = 0;
else if (v->ob_type->tp_as_number != NULL)
else if (v->ob_type->tp_as_number != NULL &&
v->ob_type->tp_as_number->nb_nonzero != NULL)
res = (*v->ob_type->tp_as_number->nb_nonzero)(v);
else if (v->ob_type->tp_as_mapping != NULL)
else if (v->ob_type->tp_as_mapping != NULL &&
v->ob_type->tp_as_mapping->mp_length != NULL)
res = (*v->ob_type->tp_as_mapping->mp_length)(v);
else if (v->ob_type->tp_as_sequence != NULL)
else if (v->ob_type->tp_as_sequence != NULL &&
v->ob_type->tp_as_sequence->sq_length != NULL)
res = (*v->ob_type->tp_as_sequence->sq_length)(v);
else
res = 1;