From: Victor Stinner <victor.stinner@gmail.com>
Date: Tue, 16 Jul 2013 20:16:05 +0000 (+0200)
Subject: Issue #18408: Fix PyDict_GetItemString(), suppress PyUnicode_FromString() error
X-Git-Tag: v3.4.0a1~185
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fdcbab96024e1607a84e3ed746e2af052ca46c11;p=python

Issue #18408: Fix PyDict_GetItemString(), suppress PyUnicode_FromString() error

As PyDict_GetItem(), PyDict_GetItemString() suppresses all errors that may
occur for historical reasons.
---

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 9d8696a89e..99247d39a3 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -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;