diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-11-14 23:14:58 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-11-14 23:14:58 (GMT) |
| commit | c4b528e809a37e619eb7574aecf1ef5e41a0580a (patch) | |
| tree | 2f7d2a67aa4f7198e73dcdb32e8da61d975c0580 | |
| parent | 413fdcea21908055cb8acad28a94b8f72eb2ffec (diff) | |
| parent | fcc2e71e99edb668cad539dc8fa9f259d0b389b6 (diff) | |
| download | cpython-c4b528e809a37e619eb7574aecf1ef5e41a0580a.zip cpython-c4b528e809a37e619eb7574aecf1ef5e41a0580a.tar.gz cpython-c4b528e809a37e619eb7574aecf1ef5e41a0580a.tar.bz2 | |
merge 3.5 (#25578)
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Modules/_ssl.c | 7 |
2 files changed, 7 insertions, 2 deletions
@@ -255,6 +255,8 @@ Library - Issue #13248: Remove deprecated inspect.getargspec and inspect.getmoduleinfo functions. +- Issue #25578: Fix (another) memory leak in SSLSocket.getpeercer(). + - Issue #25530: Disable the vulnerable SSLv3 protocol by default when creating ssl.SSLContext. diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 784040d..67402fe 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -1017,7 +1017,10 @@ _get_aia_uri(X509 *certificate, int nid) { AUTHORITY_INFO_ACCESS *info; info = X509_get_ext_d2i(certificate, NID_info_access, NULL, NULL); - if ((info == NULL) || (sk_ACCESS_DESCRIPTION_num(info) == 0)) { + if (info == NULL) + return Py_None; + if (sk_ACCESS_DESCRIPTION_num(info) == 0) { + AUTHORITY_INFO_ACCESS_free(info); return Py_None; } @@ -3967,7 +3970,7 @@ _ssl_get_default_verify_paths_impl(PyModuleDef *module) else if ((target = PyUnicode_DecodeFSDefault(tmp)) == NULL) { \ target = PyBytes_FromString(tmp); } \ if (!target) goto error; \ - } + } CONVERT(X509_get_default_cert_file_env(), ofile_env); CONVERT(X509_get_default_cert_file(), ofile); |