From 1c4f45809994fcbebd3d43ec0c771b8900e205e8 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Fri, 22 May 1998 00:53:24 +0000 Subject: [PATCH] In PyObject_IsTrue(), don't call function pointers that are NULL (nb_nonzero, mp_length, sq_length). --- Objects/object.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Objects/object.c b/Objects/object.c index 0588fea5061..964c5c59f29 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -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;