lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-11-29 01:03:57 +03:00
Code Activity

messages: Use SSH_MESSAGE_FREE

Browse Source 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Andreas Schneider
2018-09-28 15:56:06 +02:00
parent 00cd5b1c83
commit 194c34ebe3
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/messages.c
View File

@@ -382,16 +382,16 @@ static int ssh_execute_message_callback(ssh_session session, ssh_message msg) {
session->ssh_message_callback_data); session->ssh_message_callback_data);
if(ret == 1) { if(ret == 1) {
ret = ssh_message_reply_default(msg); ret = ssh_message_reply_default(msg);
ssh_message_free(msg); SSH_MESSAGE_FREE(msg);
if(ret != SSH_OK) { if(ret != SSH_OK) {
return ret; return ret;
} }
} else { } else {
ssh_message_free(msg); SSH_MESSAGE_FREE(msg);
} }
} else { } else {
ret = ssh_message_reply_default(msg); ret = ssh_message_reply_default(msg);
ssh_message_free(msg); SSH_MESSAGE_FREE(msg);
if(ret != SSH_OK) { if(ret != SSH_OK) {
return ret; return ret;
} }
@@ -425,7 +425,7 @@ static void ssh_message_queue(ssh_session session, ssh_message message)
*/ */
ret = ssh_execute_server_callbacks(session, message); ret = ssh_execute_server_callbacks(session, message);
if (ret == SSH_OK) { if (ret == SSH_OK) {
ssh_message_free(message); SSH_MESSAGE_FREE(message);
return; return;
} }
#endif /* WITH_SERVER */ #endif /* WITH_SERVER */
@@ -442,7 +442,7 @@ static void ssh_message_queue(ssh_session session, ssh_message message)
* received. Just send a default response. Do not queue it. * received. Just send a default response. Do not queue it.
*/ */
ssh_message_reply_default(message); ssh_message_reply_default(message);
ssh_message_free(message); SSH_MESSAGE_FREE(message);
return; return;
} }
@@ -455,7 +455,7 @@ static void ssh_message_queue(ssh_session session, ssh_message message)
*/ */
ssh_message_reply_default(message); ssh_message_reply_default(message);
ssh_set_error_oom(session); ssh_set_error_oom(session);
ssh_message_free(message); SSH_MESSAGE_FREE(message);
return; return;
} }
} }
@@ -930,7 +930,7 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_request){
/* bypass the message queue thing */ /* bypass the message queue thing */
SAFE_FREE(service); SAFE_FREE(service);
SAFE_FREE(method); SAFE_FREE(method);
ssh_message_free(msg); SSH_MESSAGE_FREE(msg);
return SSH_PACKET_USED; return SSH_PACKET_USED;
} }
@@ -943,7 +943,7 @@ error:
SAFE_FREE(service); SAFE_FREE(service);
SAFE_FREE(method); SAFE_FREE(method);
ssh_message_free(msg); SSH_MESSAGE_FREE(msg);
return SSH_PACKET_USED; return SSH_PACKET_USED;
end: end:
@@ -1086,7 +1086,7 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_info_response){
return SSH_PACKET_USED; return SSH_PACKET_USED;
error: error:
ssh_message_free(msg); SSH_MESSAGE_FREE(msg);
return SSH_PACKET_USED; return SSH_PACKET_USED;
} }
@@ -1185,8 +1185,7 @@ SSH_PACKET_CALLBACK(ssh_packet_channel_open){
goto end; goto end;
error: error:
ssh_message_free(msg); SSH_MESSAGE_FREE(msg);
msg=NULL;
end: end:
SAFE_FREE(type_c); SAFE_FREE(type_c);
if(msg != NULL) if(msg != NULL)
@@ -1383,7 +1382,7 @@ end:
return SSH_OK; return SSH_OK;
error: error:
ssh_message_free(msg); SSH_MESSAGE_FREE(msg);
return SSH_ERROR; return SSH_ERROR;
} }