Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge 3.5 (#25578)

This commit is contained in:
Benjamin Peterson 2015-11-14 15:14:58 -08:00
parent 413fdcea21 fcc2e71e99
commit c4b528e809
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -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.

7
Modules/_ssl.c
View File

@ -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);