From b8ff8b3ba75e19980eb02adea61978a399de3d56 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Fri, 22 May 1998 00:53:47 +0000 Subject: Make sure that no use of a function pointer gotten from a tp_as_sequence or tp_as_mapping structure is made without checking it for NULL first. --- Modules/stropmodule.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'Modules/stropmodule.c') diff --git a/Modules/stropmodule.c b/Modules/stropmodule.c index 73c2d85683..2d11851e7c 100644 --- a/Modules/stropmodule.c +++ b/Modules/stropmodule.c @@ -274,13 +274,15 @@ strop_joinfields(self, args) } return res; } - else if (!PySequence_Check(seq)) { + + if (seq->ob_type->tp_as_sequence == NULL || + (getitemfunc = seq->ob_type->tp_as_sequence->sq_item) == NULL) + { PyErr_SetString(PyExc_TypeError, "first argument must be a sequence"); return NULL; } - /* type safe */ - getitemfunc = seq->ob_type->tp_as_sequence->sq_item; + /* This is now type safe */ for (i = 0; i < seqlen; i++) { PyObject *item = getitemfunc(seq, i); if (!item || !PyString_Check(item)) { -- cgit v1.2.1