From: Victor Stinner <victor.stinner@gmail.com>
Date: Wed, 23 Mar 2016 16:48:22 +0000 (+0100)
Subject: get_warnings_attr(): Fix coverity warning
X-Git-Tag: v3.6.0a1~372
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=023654fa68c73e34da01610cad330f98d2db79cf;p=thirdparty%2FPython%2Fcpython.git

get_warnings_attr(): Fix coverity warning

Don't check if the dict key exists before getting the key. Instead get the key
and handle error.
---

diff --git a/Python/_warnings.c b/Python/_warnings.c
index 41eaf5310ae6..40f5c8ecfcd2 100644
--- a/Python/_warnings.c
+++ b/Python/_warnings.c
@@ -45,7 +45,6 @@ get_warnings_attr(const char *attr, int try_import)
     static PyObject *warnings_str = NULL;
     PyObject *all_modules;
     PyObject *warnings_module, *obj;
-    int result;
 
     if (warnings_str == NULL) {
         warnings_str = PyUnicode_InternFromString("warnings");
@@ -65,11 +64,11 @@ get_warnings_attr(const char *attr, int try_import)
     }
     else {
         all_modules = PyImport_GetModuleDict();
-        result = PyDict_Contains(all_modules, warnings_str);
-        if (result == -1 || result == 0)
-            return NULL;
 
         warnings_module = PyDict_GetItem(all_modules, warnings_str);
+        if (warnings_module == NULL)
+            return NULL;
+
         Py_INCREF(warnings_module);
     }