diff --git a/Lib/test/test_bool.py b/Lib/test/test_bool.py
index b711ffb9a3ecd5..916e22a527a8e0 100644
--- a/Lib/test/test_bool.py
+++ b/Lib/test/test_bool.py
@@ -319,6 +319,26 @@ def __len__(self):
return -1
self.assertRaises(ValueError, bool, Eggs())
+ def test_interpreter_convert_to_bool_raises(self):
+ class SymbolicBool:
+ def __bool__(self):
+ raise TypeError
+
+ class Symbol:
+ def __gt__(self, other):
+ return SymbolicBool()
+
+ x = Symbol()
+
+ with self.assertRaises(TypeError):
+ if x > 0:
+ msg = "x > 0 was true"
+ else:
+ msg = "x > 0 was false"
+
+ # This used to create negative refcounts, see gh-102250
+ del x
+
def test_from_bytes(self):
self.assertIs(bool.from_bytes(b'\x00'*8, 'big'), False)
self.assertIs(bool.from_bytes(b'abcd', 'little'), True)
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-02-26-23-10-32.gh-issue-102250.7MUKoC.rst b/Misc/NEWS.d/next/Core and Builtins/2023-02-26-23-10-32.gh-issue-102250.7MUKoC.rst
new file mode 100644
index 00000000000000..17ab0cd4367991
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2023-02-26-23-10-32.gh-issue-102250.7MUKoC.rst
@@ -0,0 +1 @@
+Fixed a segfault occurring when the interpreter calls a ``__bool__`` method that raises.
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index ad68c794fe7acb..7e9b36f697210a 100644
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -1754,9 +1754,7 @@ dummy_func(
int offset = next_instr[1].op.arg;
int err = PyObject_IsTrue(cond);
Py_DECREF(cond);
- if (err < 0) {
- goto error;
- }
+ ERROR_IF(err < 0, error);
if (jump_on_true == (err != 0)) {
JUMPBY(offset);
}
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index 2987adc3bba566..271ba26f489521 100644
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -2205,9 +2205,7 @@
int offset = next_instr[1].op.arg;
int err = PyObject_IsTrue(cond);
Py_DECREF(cond);
- if (err < 0) {
- goto error;
- }
+ if (err < 0) goto pop_2_error;
if (jump_on_true == (err != 0)) {
JUMPBY(offset);
}
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy