diff options
| author | Guido van Rossum <guido@python.org> | 1998-05-22 00:53:47 +0000 |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 1998-05-22 00:53:47 +0000 |
| commit | b8ff8b3ba75e19980eb02adea61978a399de3d56 (patch) | |
| tree | bee410377201d69389dbbbc3f43cf534e488e86d /Modules/stropmodule.c | |
| parent | 6d75317bd8c0520aff42f5817321125b2937bbdb (diff) | |
| download | cpython-b8ff8b3ba75e19980eb02adea61978a399de3d56.tar.gz | |
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.
Diffstat (limited to 'Modules/stropmodule.c')
| -rw-r--r-- | Modules/stropmodule.c | 8 |
1 files changed, 5 insertions, 3 deletions
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)) { |