summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorZackery Spytz <zspytz@gmail.com>2018-11-18 16:45:57 (GMT)
committerMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2018-11-18 16:45:57 (GMT)
commit062a57bf4b768ef726975bcc1d34398387520147 (patch)
treedfbfcc857ff4b66fbfe543ece6f4f23e492c204f /Objects
parent177a41a07b7d13c70d068ea0962f07e625ae171e (diff)
downloadcpython-062a57bf4b768ef726975bcc1d34398387520147.zip
cpython-062a57bf4b768ef726975bcc1d34398387520147.tar.gz
cpython-062a57bf4b768ef726975bcc1d34398387520147.tar.bz2
bpo-35269: Fix a possible segfault involving a newly-created coroutine (GH-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
Diffstat (limited to 'Objects')
-rw-r--r--Objects/genobject.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/genobject.c b/Objects/genobject.c
index 98c9394..716bd6d 100644
--- a/Objects/genobject.c
+++ b/Objects/genobject.c
@@ -1164,11 +1164,11 @@ PyCoro_New(PyFrameObject *f, PyObject *name, PyObject *qualname)
((PyCoroObject *)coro)->cr_origin = NULL;
} else {
PyObject *cr_origin = compute_cr_origin(origin_depth);
+ ((PyCoroObject *)coro)->cr_origin = cr_origin;
if (!cr_origin) {
Py_DECREF(coro);
return NULL;
}
- ((PyCoroObject *)coro)->cr_origin = cr_origin;
}
return coro;