diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2017-02-04 15:05:50 -0800 |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2017-02-04 15:05:50 -0800 |
| commit | 3b0e4320092ac0504b6670cafaf0301b908c91fc (patch) | |
| tree | d3be1b6b844d61763bb366fa21ceed475e5703fd /Modules/_ssl.c | |
| parent | b2fa705fd3887c326e811c418469c784353027f4 (diff) | |
| parent | f687fbcd73c14dfcbe086eb5cd94b298f1e81e72 (diff) | |
| download | cpython-3b0e4320092ac0504b6670cafaf0301b908c91fc.tar.gz | |
Issue #29392: Prevent crash when passing invalid arguments into msvcrt module.
Diffstat (limited to 'Modules/_ssl.c')
| -rw-r--r-- | Modules/_ssl.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c index b198857060..1e9a707648 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -755,8 +755,7 @@ _ssl__SSLSocket_do_handshake_impl(PySSLSocket *self) PySSL_END_ALLOW_THREADS self->handshake_done = 1; - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; error: Py_XDECREF(sock); @@ -3197,7 +3196,7 @@ _password_callback(char *buf, int size, int rwflag, void *userdata) PySSL_END_ALLOW_THREADS_S(pw_info->thread_state); if (pw_info->callable) { - fn_ret = PyObject_CallFunctionObjArgs(pw_info->callable, NULL); + fn_ret = _PyObject_CallNoArg(pw_info->callable); if (!fn_ret) { /* TODO: It would be nice to move _ctypes_add_traceback() into the core python API, so we could use it to add a frame here */ @@ -4500,8 +4499,7 @@ _ssl_RAND_add_impl(PyObject *module, Py_buffer *view, double entropy) buf += written; len -= written; } while (len); - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } static PyObject * |