summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2010-08-03 18:50:32 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2010-08-03 18:50:32 (GMT)
commitc1ef2fa45f80d2f2573c186bc2d54c89ea20f669 (patch)
treed85a113902b32de76c5ce7dcc4c41fffc1608ac9 /Modules
parent213bcb8de1e8dc8ae2668bf56b1be420ff947f1e (diff)
downloadcpython-c1ef2fa45f80d2f2573c186bc2d54c89ea20f669.zip
cpython-c1ef2fa45f80d2f2573c186bc2d54c89ea20f669.tar.gz
cpython-c1ef2fa45f80d2f2573c186bc2d54c89ea20f669.tar.bz2
Merged revisions 83680,83685 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint ................ r83680 | mark.dickinson | 2010-08-03 19:34:53 +0100 (Tue, 03 Aug 2010) | 9 lines Merged revisions 83677 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83677 | mark.dickinson | 2010-08-03 19:31:54 +0100 (Tue, 03 Aug 2010) | 1 line Fix memory leak in ssl module. ........ ................ r83685 | mark.dickinson | 2010-08-03 19:46:28 +0100 (Tue, 03 Aug 2010) | 9 lines Merged revisions 83683 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83683 | mark.dickinson | 2010-08-03 19:44:16 +0100 (Tue, 03 Aug 2010) | 1 line Misc/NEWS entry for r83677. ........ ................
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_ssl.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 6ed1a9f..4619cda 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -964,6 +964,7 @@ PySSL_test_decode_certificate (PyObject *mod, PyObject *args) {
}
retval = _decode_certificate(x, verbose);
+ X509_free(x);
fail0: