bpo-35269: Fix a possible segfault involving a newly-created coroutin… · python-emscripten/cpython@062a57b · GitHub

1. python-emscripten
2. cpython

Repository navigation

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Commit 062a57b

Browse filesBrowse the repository at this point in the historyBrowse files

ZackerySpytz

authored and

miss-islington

committed

bpo-35269: Fix a possible segfault involving a newly-created coroutine (pythonGH-10585)

coro->cr_origin wasn't initialized if compute_cr_origin() failed in PyCoro_New(), which would cause a crash during the coroutine's deallocation. https://bugs.python.org/issue35269

1 parent 177a41a commit 062a57b
Copy full SHA for 062a57b

2 files changed

+3-1Lines changed: 3 additions & 1 deletion

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Misc/NEWS.d/next/Core and Builtins
  • 2018-11-17-10-18-29.bpo-35269.gjm1LO.rst
• Objects
  • genobject.c

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Misc/NEWS.d/next/Core and Builtins/2018-11-17-10-18-29.bpo-35269.gjm1LO.rst‎

Copy file name to clipboard

+2Lines changed: 2 additions & 0 deletions

• Display the source diff
• Display the rich diff

Original file line number	Diff line number	Diff line change
@@ -0,0 +1,2 @@
	1	+ Fix a possible segfault involving a newly-created coroutine. Patch by
	2	+ Zackery Spytz.

Collapse file

‎Objects/genobject.c‎

Copy file name to clipboardExpand all lines: Objects/genobject.c

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -1164,11 +1164,11 @@ PyCoro_New(PyFrameObject *f, PyObject *name, PyObject *qualname)
1164	1164	((PyCoroObject *)coro)->cr_origin = NULL;
1165	1165	} else {
1166	1166	PyObject *cr_origin = compute_cr_origin(origin_depth);
	1167	+ ((PyCoroObject *)coro)->cr_origin = cr_origin;
1167	1168	if (!cr_origin) {
1168	1169	Py_DECREF(coro);
1169	1170	return NULL;
1170	1171	}
1171		- ((PyCoroObject *)coro)->cr_origin = cr_origin;
1172	1172	}
1173	1173
1174	1174	return coro;

0 commit comments

Comments

0 (0)