]> granicus.if.org Git - python/commitdiff
Issue #18408: Fix PyDict_GetItemString(), suppress PyUnicode_FromString() error
authorVictor Stinner <victor.stinner@gmail.com>
Tue, 16 Jul 2013 20:16:05 +0000 (22:16 +0200)
committerVictor Stinner <victor.stinner@gmail.com>
Tue, 16 Jul 2013 20:16:05 +0000 (22:16 +0200)
As PyDict_GetItem(), PyDict_GetItemString() suppresses all errors that may
occur for historical reasons.

Objects/dictobject.c

index 9d8696a89e675e5a0e57c006ddd41a3a703e7c29..99247d39a3a0d4a5f34d49a7eef5c1c50320a171 100644 (file)
@@ -2692,8 +2692,10 @@ PyDict_GetItemString(PyObject *v, const char *key)
 {
     PyObject *kv, *rv;
     kv = PyUnicode_FromString(key);
-    if (kv == NULL)
+    if (kv == NULL) {
+        PyErr_Clear();
         return NULL;
+    }
     rv = PyDict_GetItem(v, kv);
     Py_DECREF(kv);
     return rv;