lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2025-11-23 01:22:37 +03:00
Code Activity

Merge branch 'master' into michaelbuckley-security-fixes

Browse Source
This commit is contained in:
Michael Buckley
2019-03-18 15:11:43 -07:00
committed by GitHub
parent 31d0b1a853 54ff8ffc6d
commit 94086b0d89
24 changed files with 245 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/session.c
View File

@@ -510,9 +510,11 @@ libssh2_session_init_ex(LIBSSH2_ALLOC_FUNC((*my_alloc)),
* Set (or reset) a callback function
* Returns the prior address
*
* FIXME: this function relies on that we can typecast function pointers
* ALERT: this function relies on that we can typecast function pointers
* to void pointers, which isn't allowed in ISO C!
*/
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
LIBSSH2_API void *
libssh2_session_callback_set(LIBSSH2_SESSION * session,
int cbtype, void *callback)
@@ -559,6 +561,7 @@ libssh2_session_callback_set(LIBSSH2_SESSION * session,
return NULL;
}
#pragma GCC diagnostic pop
/*
* _libssh2_wait_socket()
@@ -774,7 +777,7 @@ session_startup(LIBSSH2_SESSION *session, libssh2_socket_t sock)
&session->startup_req_state);
if(rc)
return rc;
if(session->startup_data_len < 5) {
return _libssh2_error(session, LIBSSH2_ERROR_PROTO,
"Unexpected packet length");
@@ -1162,7 +1165,7 @@ libssh2_session_disconnect_ex(LIBSSH2_SESSION *session, int reason,
const char *desc, const char *lang)
{
int rc;
session->state = 0;
BLOCK_ADJUST(rc, session,
session_disconnect(session, reason, desc, lang));