Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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)
........
This commit is contained in:
Hirokazu Yamamoto 2010-12-09 12:12:42 +00:00
parent 59734be36c
commit a9b1689a89
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/_ssl.c
View File

@ -1046,10 +1046,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)
@ -1057,6 +1057,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 = PyString_FromString(cipher_name);
@ -1066,6 +1067,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 = PyString_FromString(cipher_protocol);