diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-11-14 15:14:42 -0800 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-11-14 15:14:42 -0800 |
| commit | 3e672cc22b3bb6003463052e82bfd45b0d2580fa (patch) | |
| tree | 6241b73d5311c7de12265fe48513b251288afcc3 /Modules/_ssl.c | |
| parent | 0082f5e580e04a76e6a32fb177f1dba1fba5bed0 (diff) | |
| parent | 0d2c8acee4e52587f7d60fd495a786b85b925842 (diff) | |
| download | cpython-3e672cc22b3bb6003463052e82bfd45b0d2580fa.tar.gz | |
merge 3.4 (#25578)
Diffstat (limited to 'Modules/_ssl.c')
| -rw-r--r-- | Modules/_ssl.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 784040d651..67402fe0a4 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); |