commit 2ee87913dde038436a25f1db13ee3fddd2bcc983
author Dong-hee Na <donghee.na92@gmail.com> Tue Dec 31 13:15:36 2019 +0900
committer Pablo Galindo <Pablogsal@gmail.com> Tue Dec 31 04:15:36 2019 +0000
tree 506d007f2e4b809e8360d086ba91b50568233980
parent a278ae19b4daa1deb11e2a8eed38838027e90ece

[3.8] bpo-38588: Fix possible crashes in dict and list when calling P… (GH-17764)

* [3.8] bpo-38588: Fix possible crashes in dict and list when calling PyObject_RichCompareBool (GH-17734)

Take strong references before calling PyObject_RichCompareBool to protect against the case
where the object dies during the call.
(cherry picked from commit 2d5bf568eaa5059402ccce9ba5a366986ba27c8a)

Co-authored-by: Dong-hee Na <donghee.na92@gmail.com>

* Update Objects/listobject.c

@methane's suggestion

Co-Authored-By: Inada Naoki <songofacandy@gmail.com>

Co-authored-by: Inada Naoki <songofacandy@gmail.com>

Objects/dictobject.c

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 76f4fef..3c56f4a 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -2773,9 +2773,11 @@
                     return -1;
                 return 0;
             }
+            Py_INCREF(bval);
             cmp = PyObject_RichCompareBool(aval, bval, Py_EQ);
             Py_DECREF(key);
             Py_DECREF(aval);
+            Py_DECREF(bval);
             if (cmp <= 0)  /* error or not equal */
                 return cmp;
         }