[pypy-commit] pypy pypy3-release-2.4.x: fix _SSLContext invalid protocol errors not ensuring a self.ctx, leading to a

pjenvey noreply at buildbot.pypy.org
Fri Oct 17 22:12:47 CEST 2014


Author: Philip Jenvey <pjenvey at underboss.org>
Branch: pypy3-release-2.4.x
Changeset: r74006:b2091e973da6
Date: 2014-10-17 13:09 -0700
http://bitbucket.org/pypy/pypy/changeset/b2091e973da6/

Log:	fix _SSLContext invalid protocol errors not ensuring a self.ctx,
	leading to a potential crash in its destructor (grafted from
	c1ddf2d919a18fa4ebec03ce84e1a0457f4396ad)

diff --git a/pypy/module/_ssl/interp_ssl.py b/pypy/module/_ssl/interp_ssl.py
--- a/pypy/module/_ssl/interp_ssl.py
+++ b/pypy/module/_ssl/interp_ssl.py
@@ -90,6 +90,8 @@
 
 
 class SSLContext(W_Root):
+    ctx = lltype.nullptr(SSL_CTX.TO)
+
     def __init__(self, space, protocol):
         if protocol == PY_SSL_VERSION_TLS1:
             method = libssl_TLSv1_method()


More information about the pypy-commit mailing list