summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorHirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>2010-12-09 12:30:05 (GMT)
committerHirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>2010-12-09 12:30:05 (GMT)
commit8e63c687eff570ab99a89600a69178b63896d40c (patch)
treef1472e5c25b52f8f751f2820bf269842e76c41e9 /Modules
parentba466cd208926ad3b2ff3e292659258cdbf8f8c5 (diff)
downloadcpython-8e63c687eff570ab99a89600a69178b63896d40c.zip
cpython-8e63c687eff570ab99a89600a69178b63896d40c.tar.gz
cpython-8e63c687eff570ab99a89600a69178b63896d40c.tar.bz2
Merged revisions 87140 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r87140 | hirokazu.yamamoto | 2010-12-09 19:49:00 +0900 (木, 09 12 2010) | 2 lines Should call Py_INCREF for Py_None (Modules/_ssl.c: PySSL_cipher) ........
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_ssl.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index d4e550e..73a76bb 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -1047,10 +1047,10 @@ static PyObject *PySSL_cipher (PySSLObject *self) {
char *cipher_protocol;
if (self->ssl == NULL)
- return Py_None;
+ Py_RETURN_NONE;
current = SSL_get_current_cipher(self->ssl);
if (current == NULL)
- return Py_None;
+ Py_RETURN_NONE;
retval = PyTuple_New(3);
if (retval == NULL)
@@ -1058,6 +1058,7 @@ static PyObject *PySSL_cipher (PySSLObject *self) {
cipher_name = (char *) SSL_CIPHER_get_name(current);
if (cipher_name == NULL) {
+ Py_INCREF(Py_None);
PyTuple_SET_ITEM(retval, 0, Py_None);
} else {
v = PyUnicode_FromString(cipher_name);
@@ -1067,6 +1068,7 @@ static PyObject *PySSL_cipher (PySSLObject *self) {
}
cipher_protocol = SSL_CIPHER_get_version(current);
if (cipher_protocol == NULL) {
+ Py_INCREF(Py_None);
PyTuple_SET_ITEM(retval, 1, Py_None);
} else {
v = PyUnicode_FromString(cipher_protocol);