diff options
author | Benjamin Peterson <benjamin@python.org> | 2013-01-02 09:36:23 -0600 |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2013-01-02 09:36:23 -0600 |
commit | 6b3f8d375b9e55727f5a3f62d2bf6204ab8b350a (patch) | |
tree | 362949a7c9ec147218457c7e301f92e260d4f311 /Objects/object.c | |
parent | 5ca88d2b181fe42ced2f590f2a4115b48860240d (diff) | |
download | cpython-git-6b3f8d375b9e55727f5a3f62d2bf6204ab8b350a.tar.gz |
ensure the attribute name string is initalized before using it (closes #16839)
Diffstat (limited to 'Objects/object.c')
-rw-r--r-- | Objects/object.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Objects/object.c b/Objects/object.c index e732dceff6..14f4e9f611 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -474,7 +474,7 @@ PyObject_Unicode(PyObject *v) PyObject *func; PyObject *str; int unicode_method_found = 0; - static PyObject *unicodestr; + static PyObject *unicodestr = NULL; if (v == NULL) { res = PyString_FromString("<NULL>"); @@ -491,6 +491,11 @@ PyObject_Unicode(PyObject *v) if (PyInstance_Check(v)) { /* We're an instance of a classic class */ /* Try __unicode__ from the instance -- alas we have no type */ + if (!unicodestr) { + unicodestr = PyString_InternFromString("__unicode__"); + if (!unicodestr) + return NULL; + } func = PyObject_GetAttr(v, unicodestr); if (func != NULL) { unicode_method_found = 1; |