diff options
| author | neonene <53406459+neonene@users.noreply.github.com> | 2019-09-09 12:33:43 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@python.org> | 2019-09-09 12:33:43 (GMT) |
| commit | ed70129e15ea028469145111044a4349960a4e6f (patch) | |
| tree | 460ba098e0afe9dab035f62e1f08f67d074a82d4 | |
| parent | b4612f5d54aced5bc37f1b85bf50b4cafa2480f0 (diff) | |
| download | cpython-ed70129e15ea028469145111044a4349960a4e6f.zip cpython-ed70129e15ea028469145111044a4349960a4e6f.tar.gz cpython-ed70129e15ea028469145111044a4349960a4e6f.tar.bz2 | |
bpo-37702: Fix SSL's certificate-store leak on Windows (GH-15632)
ssl_collect_certificates function in _ssl.c has a memory leak.
Calling CertOpenStore() and CertAddStoreToCollection(), a store's refcnt gets incremented by 2.
But CertCloseStore() is called only once and the refcnt leaves 1.
| -rw-r--r-- | Misc/NEWS.d/next/Windows/2019-07-29-16-49-31.bpo-37702.Lj2f5e.rst | 2 | ||||
| -rw-r--r-- | Modules/_ssl.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Misc/NEWS.d/next/Windows/2019-07-29-16-49-31.bpo-37702.Lj2f5e.rst b/Misc/NEWS.d/next/Windows/2019-07-29-16-49-31.bpo-37702.Lj2f5e.rst new file mode 100644 index 0000000..67d53d4 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2019-07-29-16-49-31.bpo-37702.Lj2f5e.rst @@ -0,0 +1,2 @@ +Fix memory leak on Windows in creating an SSLContext object or +running urllib.request.urlopen('https://...').
\ No newline at end of file diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 3d63612..d94efa9 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -5581,6 +5581,7 @@ ssl_collect_certificates(const char *store_name) if (result) { ++storesAdded; } + CertCloseStore(hSystemStore, 0); /* flag must be 0 */ } } if (storesAdded == 0) { |