diff options
| author | INADA Naoki <methane@users.noreply.github.com> | 2017-08-24 05:55:17 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-24 05:55:17 (GMT) |
| commit | a6296d34a478b4f697ea9db798146195075d496c (patch) | |
| tree | 6a26d56297f7d85dd6a8f18bca96e0c4ffb60802 /Modules/_ssl.c | |
| parent | bf9075a0c55186d2f34df63e6c8512dd6414ff4b (diff) | |
| download | cpython-a6296d34a478b4f697ea9db798146195075d496c.zip cpython-a6296d34a478b4f697ea9db798146195075d496c.tar.gz cpython-a6296d34a478b4f697ea9db798146195075d496c.tar.bz2 | |
bpo-31095: fix potential crash during GC (GH-2974)
Diffstat (limited to 'Modules/_ssl.c')
| -rw-r--r-- | Modules/_ssl.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 1380c57..e8abcb2 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -2778,6 +2778,8 @@ context_clear(PySSLContext *self) static void context_dealloc(PySSLContext *self) { + /* bpo-31095: UnTrack is needed before calling any callbacks */ + PyObject_GC_UnTrack(self); context_clear(self); SSL_CTX_free(self->ctx); #ifdef OPENSSL_NPN_NEGOTIATED @@ -4292,6 +4294,7 @@ static PyTypeObject PySSLMemoryBIO_Type = { static void PySSLSession_dealloc(PySSLSession *self) { + /* bpo-31095: UnTrack is needed before calling any callbacks */ PyObject_GC_UnTrack(self); Py_XDECREF(self->ctx); if (self->session != NULL) { |