shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-11 18:50:28 +09:00
Code Issues Packages Projects Releases Wiki Activity

sftp: Fix integer types in sftp_write() and sftp_packet_write()

Browse Source 
Fixes T188

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
(cherry picked from commit 6b105624bf)
This commit is contained in:
Andreas Schneider
2019-10-31 15:51:54 +01:00
parent 6a0cbc73bd
commit e9b74b5cb7
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/libssh/sftp_priv.h
View File

@@ -22,7 +22,7 @@
#define SFTP_PRIV_H #define SFTP_PRIV_H
sftp_packet sftp_packet_read(sftp_session sftp); sftp_packet sftp_packet_read(sftp_session sftp);
int sftp_packet_write(sftp_session sftp, uint8_t type, ssh_buffer payload); ssize_t sftp_packet_write(sftp_session sftp, uint8_t type, ssh_buffer payload);
void sftp_packet_free(sftp_packet packet); void sftp_packet_free(sftp_packet packet);
int buffer_add_attributes(ssh_buffer buffer, sftp_attributes attr); int buffer_add_attributes(ssh_buffer buffer, sftp_attributes attr);
sftp_attributes sftp_parse_attr(sftp_session session, sftp_attributes sftp_parse_attr(sftp_session session,

10
src/sftp.c
View File

@@ -359,11 +359,11 @@ void sftp_free(sftp_session sftp)
SAFE_FREE(sftp); SAFE_FREE(sftp);
} }
int sftp_packet_write(sftp_session sftp, uint8_t type, ssh_buffer payload) ssize_t sftp_packet_write(sftp_session sftp, uint8_t type, ssh_buffer payload)
{ {
uint8_t header[5] = {0}; uint8_t header[5] = {0};
uint32_t payload_size; uint32_t payload_size;
int size; ssize_t size;
int rc; int rc;
/* Add size of type */ /* Add size of type */
@@ -388,7 +388,7 @@ int sftp_packet_write(sftp_session sftp, uint8_t type, ssh_buffer payload)
if ((uint32_t)size != ssh_buffer_get_len(payload)) { if ((uint32_t)size != ssh_buffer_get_len(payload)) {
SSH_LOG(SSH_LOG_PACKET, SSH_LOG(SSH_LOG_PACKET,
"Had to write %d bytes, wrote only %d", "Had to write %d bytes, wrote only %zd",
ssh_buffer_get_len(payload), ssh_buffer_get_len(payload),
size); size);
} }
@@ -2128,8 +2128,8 @@ ssize_t sftp_write(sftp_file file, const void *buf, size_t count) {
sftp_status_message status; sftp_status_message status;
ssh_buffer buffer; ssh_buffer buffer;
uint32_t id; uint32_t id;
int len; ssize_t len;
int packetlen; size_t packetlen;
int rc; int rc;
buffer = ssh_buffer_new(); buffer = ssh_buffer_new();