From 0eb1115f4415593861a85aad3c7d12081252c866 Mon Sep 17 00:00:00 2001 From: Jeremy Hylton Date: Mon, 30 Jul 2001 22:39:31 +0000 Subject: Fix for SF byg [ #420304 ] getattr function w/ default Fix suggested by Michael Hudson: Raise TypeError if attribute name passed to getattr() is not a string or Unicode. There is some unfortunate duplication of code between builtin_getattr() and PyObject_GetAttr(), but it appears to be unavoidable. --- Python/bltinmodule.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index 362cdaa..571cfe2 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -890,6 +890,17 @@ builtin_getattr(PyObject *self, PyObject *args) if (!PyArg_ParseTuple(args, "OO|O:getattr", &v, &name, &dflt)) return NULL; + if (PyUnicode_Check(name)) { + name = _PyUnicode_AsDefaultEncodedString(name, NULL); + if (name == NULL) + return NULL; + } + + if (!PyString_Check(name)) { + PyErr_SetString(PyExc_TypeError, + "attribute name must be string"); + return NULL; + } result = PyObject_GetAttr(v, name); if (result == NULL && dflt != NULL) { PyErr_Clear(); -- cgit v0.12