commit e2f376f284b7bf1388d85e99dce646cabc507016
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Wed Dec 05 11:35:41 2018 -0800
committer GitHub <noreply@github.com> Wed Dec 05 11:35:41 2018 -0800
tree 454d51ae543140ef4ecaacf6d71dab92f4ed8bdd
parent 983d1ab0e6f4280f954bcba87db76e11131f1c33

bpo-34987: Fix a possible null pointer dereference in _pickle.c's save_reduce(). (GH-9886)

(cherry picked from commit 25d389789c59a52a31770f7c50ce9e02a8909190)

Co-authored-by: Zackery Spytz <zspytz@gmail.com>

Modules/_pickle.c

diff --git a/Modules/_pickle.c b/Modules/_pickle.c
index a1a90bd..57bb771 100644
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -3838,7 +3838,10 @@
 
         if (obj != NULL) {
             obj_class = get_class(obj);
-            p = obj_class != cls;    /* true iff a problem */
+            if (obj_class == NULL) {
+                return -1;
+            }
+            p = obj_class != cls;
             Py_DECREF(obj_class);
             if (p) {
                 PyErr_SetString(st->PicklingError, "args[0] from "