mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-16 15:55:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 87140 via svnmerge from

Browse source 
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:30:05 +00:00
parent ba466cd208
commit 8e63c687ef
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Modules/_ssl.c
View file

@ -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);