NotificationsYou must be signed in to change notification settings
Fork0
Star1

Commit022b44f

authored

pythongh-102056: Fix a few bugs in error handling of exception printing code (python#102078)

1 parent4d3bc89 commit022b44fCopy full SHA for 022b44f

File tree

3 files changed

+48

-7

lines changed

Lib/test
- test_threading.py
Misc/NEWS.d/next/Core and Builtins
- 2023-02-20-15-18-33.gh-issue-102056.uHKuwH.rst
Python
- pythonrun.c

3 files changed

+48

-7

lines changed

`‎Lib/test/test_threading.py‎`

Lines changed: 31 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1523,6 +1523,37 @@ def run():`
`1523`	`1523`	`self.assertEqual(out,b'')`
`1524`	`1524`	`self.assertNotIn("Unhandled exception",err.decode())`
`1525`	`1525`
	`1526`	`+deftest_print_exception_gh_102056(self):`
	`1527`	`+# This used to crash. See gh-102056.`
	`1528`	`+script=r"""if True:`
	`1529`	`+ import time`
	`1530`	`+ import threading`
	`1531`	`+ import _thread`
	`1532`	`+`
	`1533`	`+ def f():`
	`1534`	`+ try:`
	`1535`	`+ f()`
	`1536`	`+ except RecursionError:`
	`1537`	`+ f()`
	`1538`	`+`
	`1539`	`+ def g():`
	`1540`	`+ try:`
	`1541`	`+ raise ValueError()`
	`1542`	`+ except* ValueError:`
	`1543`	`+ f()`
	`1544`	`+`
	`1545`	`+ def h():`
	`1546`	`+ time.sleep(1)`
	`1547`	`+ _thread.interrupt_main()`
	`1548`	`+`
	`1549`	`+ t = threading.Thread(target=h)`
	`1550`	`+ t.start()`
	`1551`	`+ g()`
	`1552`	`+ t.join()`
	`1553`	`+ """`
	`1554`	`+`
	`1555`	`+assert_python_failure("-c",script)`
	`1556`	`+`
`1526`	`1557`	`deftest_bare_raise_in_brand_new_thread(self):`
`1527`	`1558`	`defbare_raise():`
`1528`	`1559`	`raise`

`‎Misc/NEWS.d/next/Core and Builtins/2023-02-20-15-18-33.gh-issue-102056.uHKuwH.rst‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fix error handling bugs in interpreter's exception printing code, which could cause a crash on infinite recursion.`

`‎Python/pythonrun.c‎`

Lines changed: 16 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -1246,8 +1246,7 @@ print_chained(struct exception_print_context* ctx, PyObject *value,`
`1246`	`1246`	`constcharmessage,constchartag)`
`1247`	`1247`	`{`
`1248`	`1248`	`PyObject*f=ctx->file;`
`1249`		`-`
`1250`		`-if (_Py_EnterRecursiveCall(" in print_chained")<0) {`
	`1249`	`+if (_Py_EnterRecursiveCall(" in print_chained")) {`
`1251`	`1250`	`return-1;`
`1252`	`1251`	`}`
`1253`	`1252`	`boolneed_close=ctx->need_close;`
`@@ -1374,7 +1373,9 @@ print_exception_group(struct exception_print_context ctx, PyObject value)`
`1374`	`1373`	`if (ctx->exception_group_depth==0) {`
`1375`	`1374`	`ctx->exception_group_depth+=1;`
`1376`	`1375`	`}`
`1377`		`-print_exception(ctx,value);`
	`1376`	`+if (print_exception(ctx,value)<0) {`
	`1377`	`+return-1;`
	`1378`	`+ }`
`1378`	`1379`
`1379`	`1380`	`PyObjectexcs= ((PyBaseExceptionGroupObject)value)->excs;`
`1380`	`1381`	`assert(excs&&PyTuple_Check(excs));`
`@@ -1424,7 +1425,7 @@ print_exception_group(struct exception_print_context ctx, PyObject value)`
`1424`	`1425`	`PyObject*exc=PyTuple_GET_ITEM(excs,i);`
`1425`	`1426`
`1426`	`1427`	`if (!truncated) {`
`1427`		`-if (_Py_EnterRecursiveCall(" in print_exception_group")!=0) {`
	`1428`	`+if (_Py_EnterRecursiveCall(" in print_exception_group")) {`
`1428`	`1429`	`return-1;`
`1429`	`1430`	`}`
`1430`	`1431`	`intres=print_exception_recursive(ctx,exc);`
`@@ -1477,22 +1478,30 @@ print_exception_group(struct exception_print_context ctx, PyObject value)`
`1477`	`1478`	`staticint`
`1478`	`1479`	`print_exception_recursive(structexception_print_contextctx,PyObjectvalue)`
`1479`	`1480`	`{`
	`1481`	`+if (_Py_EnterRecursiveCall(" in print_exception_recursive")) {`
	`1482`	`+return-1;`
	`1483`	`+ }`
`1480`	`1484`	`if (ctx->seen!=NULL) {`
`1481`	`1485`	`/* Exception chaining */`
`1482`	`1486`	`if (print_exception_cause_and_context(ctx,value)<0) {`
`1483`		`-return-1;`
	`1487`	`+gotoerror;`
`1484`	`1488`	`}`
`1485`	`1489`	`}`
`1486`	`1490`	`if (!_PyBaseExceptionGroup_Check(value)) {`
`1487`	`1491`	`if (print_exception(ctx,value)<0) {`
`1488`		`-return-1;`
	`1492`	`+gotoerror;`
`1489`	`1493`	`}`
`1490`	`1494`	`}`
`1491`	`1495`	`elseif (print_exception_group(ctx,value)<0) {`
`1492`		`-return-1;`
	`1496`	`+gotoerror;`
`1493`	`1497`	`}`
`1494`	`1498`	`assert(!PyErr_Occurred());`
	`1499`	`+`
	`1500`	`+_Py_LeaveRecursiveCall();`
`1495`	`1501`	`return0;`
	`1502`	`+error:`
	`1503`	`+_Py_LeaveRecursiveCall();`
	`1504`	`+return-1;`
`1496`	`1505`	`}`
`1497`	`1506`
`1498`	`1507`	`#definePyErr_MAX_GROUP_WIDTH 15`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit022b44f

File tree

3 files changed

3 files changed

`‎Lib/test/test_threading.py‎`

`‎Misc/NEWS.d/next/Core and Builtins/2023-02-20-15-18-33.gh-issue-102056.uHKuwH.rst‎`

`‎Python/pythonrun.c‎`

0 commit comments