From: Brij Kapadia <97006829+bkap123@users.noreply.github.com>
Date: Mon, 23 Mar 2026 22:41:53 +0000 (-0400)
Subject: gh-146199: Fix error handling in `code_richcompare` when `PyObject_RichCompareBool... 
X-Git-Tag: v3.15.0a8~199
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e017971eb9f98b2caa3cde6a74ee0acec41529c4;p=thirdparty%2FPython%2Fcpython.git

gh-146199: Fix error handling in `code_richcompare` when `PyObject_RichCompareBool` fails (#146200)

Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>
Co-authored-by: Victor Stinner <vstinner@python.org>
---

diff --git a/Lib/test/test_code.py b/Lib/test/test_code.py
index 19fa387cd7b2..fac7e9148f15 100644
--- a/Lib/test/test_code.py
+++ b/Lib/test/test_code.py
@@ -1164,6 +1164,18 @@ class CodeTest(unittest.TestCase):
                     with self.assertRaises(Exception):
                         _testinternalcapi.verify_stateless_code(func)
 
+    def test_code_richcompare_raise_exception(self):
+        class BadStr(str):
+            def __eq__(self, _):
+                raise RuntimeError("Poison!")
+
+            __hash__ = str.__hash__
+
+        c1 = compile("pass", "test", "exec")
+        c2 = c1.replace(co_name=BadStr("poison"))
+        c3 = compile("pass", "poison", "exec")
+        with self.assertRaises(RuntimeError):
+            c2 == c3
 
 def isinterned(s):
     return s is sys.intern(('_' + s + '_')[1:-1])
diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2026-03-20-12-26-24.gh-issue-146199.vV8V9s.rst b/Misc/NEWS.d/next/Core_and_Builtins/2026-03-20-12-26-24.gh-issue-146199.vV8V9s.rst
new file mode 100644
index 000000000000..0611a0d6a6d6
--- /dev/null
+++ b/Misc/NEWS.d/next/Core_and_Builtins/2026-03-20-12-26-24.gh-issue-146199.vV8V9s.rst
@@ -0,0 +1 @@
+Comparison of code objects now handles errors correctly.
diff --git a/Objects/codeobject.c b/Objects/codeobject.c
index 84a712b2b2c0..891aa4ee78c0 100644
--- a/Objects/codeobject.c
+++ b/Objects/codeobject.c
@@ -2607,7 +2607,7 @@ code_richcompare(PyObject *self, PyObject *other, int op)
     cp = (PyCodeObject *)other;
 
     eq = PyObject_RichCompareBool(co->co_name, cp->co_name, Py_EQ);
-    if (!eq) goto unequal;
+    if (eq <= 0) goto unequal;
     eq = co->co_argcount == cp->co_argcount;
     if (!eq) goto unequal;
     eq = co->co_posonlyargcount == cp->co_posonlyargcount;