Should call Py_INCREF for Py_None (Modules/_ssl.c: PySSL_cipher)

Hirokazu Yamamoto · Hirokazu Yamamoto · commit 524f10359b4a · 2010-12-09T10:49:00.000Z
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
@@ -928,17 +928,18 @@ static PyObject *PySSL_cipher (PySSLSocket *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)
         return NULL;
 
     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);
@@ -948,6 +949,7 @@ static PyObject *PySSL_cipher (PySSLSocket *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);
