From: Christian Heimes <christian@python.org>
Date: Wed, 6 Sep 2017 04:43:19 +0000 (-0700)
Subject: [3.6] _pickle: Fix whichmodule() (GH-3358) (#3361)
X-Git-Tag: v3.6.3rc1~83
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c3c3062169fad11e0e74aa85ff1f3d69c0170d42;p=python

[3.6] _pickle: Fix whichmodule() (GH-3358) (#3361)

_PyUnicode_FromId() can return NULL: replace Py_INCREF() with
Py_XINCREF().

Fix coverity report: CID 1417269.
(cherry picked from commit af46eb8)
---

diff --git a/Modules/_pickle.c b/Modules/_pickle.c
index 920b46fc28..ef0a03b107 100644
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -1705,7 +1705,7 @@ whichmodule(PyObject *global, PyObject *dotted_path)
 
     /* If no module is found, use __main__. */
     module_name = _PyUnicode_FromId(&PyId___main__);
-    Py_INCREF(module_name);
+    Py_XINCREF(module_name);
     return module_name;
 }