aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2019-10-28 13:33:21 +0100
committerAndreas Schneider <asn@cryptomilk.org>2019-12-09 16:08:03 +0100
commit88a3dd86f1a3e42618dbf2ad6e120df64c92aac1 (patch)
treef59082038ce90adc46bf4b4accf3fbda1e758795
parent449c0d66ccbd9e558cae0bc59a0d98bdb95160c0 (diff)
downloadlibssh-88a3dd86f1a3e42618dbf2ad6e120df64c92aac1.tar.gz
libssh-88a3dd86f1a3e42618dbf2ad6e120df64c92aac1.tar.xz
libssh-88a3dd86f1a3e42618dbf2ad6e120df64c92aac1.zip
packet_cb: Use SSH_BUFFER_FREE()
Fixes T183 Signed-off-by: Andreas Schneider <asn@cryptomilk.org> Reviewed-by: Jakub Jelen <jjelen@redhat.com>
-rw-r--r--src/sftpserver.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/sftpserver.c b/src/sftpserver.c
index fd4f1d68..5a2110e5 100644
--- a/src/sftpserver.c
+++ b/src/sftpserver.c
@@ -280,7 +280,7 @@ void sftp_client_message_free(sftp_client_message msg) {
SSH_STRING_FREE(msg->data);
SSH_STRING_FREE(msg->handle);
sftp_attributes_free(msg->attr);
- ssh_buffer_free(msg->complete_message);
+ SSH_BUFFER_FREE(msg->complete_message);
SAFE_FREE(msg->str_data);
ZERO_STRUCTP(msg);
SAFE_FREE(msg);
@@ -298,7 +298,7 @@ int sftp_reply_name(sftp_client_message msg, const char *name,
file = ssh_string_from_char(name);
if (file == NULL) {
- ssh_buffer_free(out);
+ SSH_BUFFER_FREE(out);
return -1;
}
@@ -308,11 +308,11 @@ int sftp_reply_name(sftp_client_message msg, const char *name,
ssh_buffer_add_ssh_string(out, file) < 0 || /* The protocol is broken here between 3 & 4 */
buffer_add_attributes(out, attr) < 0 ||
sftp_packet_write(msg->sftp, SSH_FXP_NAME, out) < 0) {
- ssh_buffer_free(out);
+ SSH_BUFFER_FREE(out);
SSH_STRING_FREE(file);
return -1;
}
- ssh_buffer_free(out);
+ SSH_BUFFER_FREE(out);
SSH_STRING_FREE(file);
return 0;
@@ -329,10 +329,10 @@ int sftp_reply_handle(sftp_client_message msg, ssh_string handle){
if (ssh_buffer_add_u32(out, msg->id) < 0 ||
ssh_buffer_add_ssh_string(out, handle) < 0 ||
sftp_packet_write(msg->sftp, SSH_FXP_HANDLE, out) < 0) {
- ssh_buffer_free(out);
+ SSH_BUFFER_FREE(out);
return -1;
}
- ssh_buffer_free(out);
+ SSH_BUFFER_FREE(out);
return 0;
}
@@ -348,10 +348,10 @@ int sftp_reply_attr(sftp_client_message msg, sftp_attributes attr) {
if (ssh_buffer_add_u32(out, msg->id) < 0 ||
buffer_add_attributes(out, attr) < 0 ||
sftp_packet_write(msg->sftp, SSH_FXP_ATTRS, out) < 0) {
- ssh_buffer_free(out);
+ SSH_BUFFER_FREE(out);
return -1;
}
- ssh_buffer_free(out);
+ SSH_BUFFER_FREE(out);
return 0;
}
@@ -399,7 +399,7 @@ int sftp_reply_names(sftp_client_message msg) {
out = ssh_buffer_new();
if (out == NULL) {
- ssh_buffer_free(msg->attrbuf);
+ SSH_BUFFER_FREE(msg->attrbuf);
return -1;
}
@@ -408,13 +408,13 @@ int sftp_reply_names(sftp_client_message msg) {
ssh_buffer_add_data(out, ssh_buffer_get(msg->attrbuf),
ssh_buffer_get_len(msg->attrbuf)) < 0 ||
sftp_packet_write(msg->sftp, SSH_FXP_NAME, out) < 0) {
- ssh_buffer_free(out);
- ssh_buffer_free(msg->attrbuf);
+ SSH_BUFFER_FREE(out);
+ SSH_BUFFER_FREE(msg->attrbuf);
return -1;
}
- ssh_buffer_free(out);
- ssh_buffer_free(msg->attrbuf);
+ SSH_BUFFER_FREE(out);
+ SSH_BUFFER_FREE(msg->attrbuf);
msg->attr_num = 0;
msg->attrbuf = NULL;
@@ -434,7 +434,7 @@ int sftp_reply_status(sftp_client_message msg, uint32_t status,
s = ssh_string_from_char(message ? message : "");
if (s == NULL) {
- ssh_buffer_free(out);
+ SSH_BUFFER_FREE(out);
return -1;
}
@@ -443,12 +443,12 @@ int sftp_reply_status(sftp_client_message msg, uint32_t status,
ssh_buffer_add_ssh_string(out, s) < 0 ||
ssh_buffer_add_u32(out, 0) < 0 || /* language string */
sftp_packet_write(msg->sftp, SSH_FXP_STATUS, out) < 0) {
- ssh_buffer_free(out);
+ SSH_BUFFER_FREE(out);
SSH_STRING_FREE(s);
return -1;
}
- ssh_buffer_free(out);
+ SSH_BUFFER_FREE(out);
SSH_STRING_FREE(s);
return 0;
@@ -466,10 +466,10 @@ int sftp_reply_data(sftp_client_message msg, const void *data, int len) {
ssh_buffer_add_u32(out, ntohl(len)) < 0 ||
ssh_buffer_add_data(out, data, len) < 0 ||
sftp_packet_write(msg->sftp, SSH_FXP_DATA, out) < 0) {
- ssh_buffer_free(out);
+ SSH_BUFFER_FREE(out);
return -1;
}
- ssh_buffer_free(out);
+ SSH_BUFFER_FREE(out);
return 0;
}