From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Thu, 9 Dec 2010 12:30:05 +0000 (+0000)
Subject: Merged revisions 87140 via svnmerge from
X-Git-Tag: v3.2.1b1~347^2~186
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e63c687eff570ab99a89600a69178b63896d40c;p=thirdparty%2FPython%2Fcpython.git

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)
........
---

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index d4e550ecf473..73a76bbc0586 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);