mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-06 18:08:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #10989: Fix a crash on SSLContext.load_verify_locations(None, True).

Browse source 
Patch reviewed by Antoine Pitrou, okayed by Georg Brandl.
This commit is contained in:
Victor Stinner 2011-01-29 11:31:20 +00:00
parent a1eac7218b
commit 80f75e684e
3 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/test/test_ssl.py
View file

@ -394,6 +394,9 @@ class ContextTests(unittest.TestCase):
ctx.load_verify_locations(CERTFILE, CAPATH) ctx.load_verify_locations(CERTFILE, CAPATH)
ctx.load_verify_locations(CERTFILE, capath=BYTES_CAPATH) ctx.load_verify_locations(CERTFILE, capath=BYTES_CAPATH)
# Issue #10989: crash if the second argument type is invalid
self.assertRaises(TypeError, ctx.load_verify_locations, None, True)
@skip_if_broken_ubuntu_ssl @skip_if_broken_ubuntu_ssl
def test_session_stats(self): def test_session_stats(self):
for proto in PROTOCOLS: for proto in PROTOCOLS:

2
Misc/NEWS
View file

@ -16,6 +16,8 @@ Core and Builtins
Library Library
------- -------
- Issue #10989: Fix a crash on SSLContext.load_verify_locations(None, True).
- Issue #11020: Command-line pyclbr was broken because of missing 2-to-3 - Issue #11020: Command-line pyclbr was broken because of missing 2-to-3
conversion. conversion.

2
Modules/_ssl.c
View file

@ -1683,7 +1683,7 @@ load_verify_locations(PySSLContext *self, PyObject *args, PyObject *kwds)
return NULL; return NULL;
} }
if (capath && !PyUnicode_FSConverter(capath, &capath_bytes)) { if (capath && !PyUnicode_FSConverter(capath, &capath_bytes)) {
Py_DECREF(cafile_bytes); Py_XDECREF(cafile_bytes);
PyErr_SetString(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
"capath should be a valid filesystem path"); "capath should be a valid filesystem path");
return NULL; return NULL;