mirror of
https://git.libssh.org/projects/libssh.git
synced 2025-07-28 01:41:48 +03:00
fix(callbacks): make is_callback_valid's behaviour consistent with its name
Signed-off-by: Praneeth Sarode <praneethsarode@gmail.com> Reviewed-by: Jakub Jelen <jjelen@redhat.com>
This commit is contained in:
committed by
Jakub Jelen
parent
5d3ef7261c
commit
0b4b71cc11
@ -28,7 +28,7 @@
|
|||||||
#include "libssh/session.h"
|
#include "libssh/session.h"
|
||||||
|
|
||||||
#define is_callback_valid(session, cb) \
|
#define is_callback_valid(session, cb) \
|
||||||
(cb->size <= 0 || cb->size > 1024 * sizeof(void *))
|
(cb->size > 0 || cb->size <= 1024 * sizeof(void *))
|
||||||
|
|
||||||
/* LEGACY */
|
/* LEGACY */
|
||||||
static void ssh_legacy_log_callback(int priority,
|
static void ssh_legacy_log_callback(int priority,
|
||||||
@ -59,7 +59,7 @@ int ssh_set_callbacks(ssh_session session, ssh_callbacks cb)
|
|||||||
return SSH_ERROR;
|
return SSH_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (is_callback_valid(session, cb)) {
|
if (!is_callback_valid(session, cb)) {
|
||||||
ssh_set_error(session,
|
ssh_set_error(session,
|
||||||
SSH_FATAL,
|
SSH_FATAL,
|
||||||
"Invalid callback passed in (badly initialized)");
|
"Invalid callback passed in (badly initialized)");
|
||||||
@ -88,7 +88,7 @@ static int ssh_add_set_channel_callbacks(ssh_channel channel,
|
|||||||
}
|
}
|
||||||
session = channel->session;
|
session = channel->session;
|
||||||
|
|
||||||
if (is_callback_valid(session, cb)) {
|
if (!is_callback_valid(session, cb)) {
|
||||||
ssh_set_error(session,
|
ssh_set_error(session,
|
||||||
SSH_FATAL,
|
SSH_FATAL,
|
||||||
"Invalid callback passed in (badly initialized)");
|
"Invalid callback passed in (badly initialized)");
|
||||||
@ -144,7 +144,7 @@ int ssh_set_server_callbacks(ssh_session session, ssh_server_callbacks cb)
|
|||||||
return SSH_ERROR;
|
return SSH_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (is_callback_valid(session, cb)) {
|
if (!is_callback_valid(session, cb)) {
|
||||||
ssh_set_error(session,
|
ssh_set_error(session,
|
||||||
SSH_FATAL,
|
SSH_FATAL,
|
||||||
"Invalid callback passed in (badly initialized)");
|
"Invalid callback passed in (badly initialized)");
|
||||||
|
Reference in New Issue
Block a user