diff options
author | Andreas Schneider <asn@cryptomilk.org> | 2015-01-14 11:07:30 +0100 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2015-01-14 15:21:36 +0100 |
commit | fd3b1f63a135b13f90af5c6e6516ecfdbfa540e0 (patch) | |
tree | faef4a50a7b28c46b99bbe44c230dd7e4c8c38a2 | |
parent | 914f8abde8a06b3a0e0e08b309dad62f5f0d7908 (diff) | |
download | libssh-fd3b1f63a135b13f90af5c6e6516ecfdbfa540e0.tar.gz libssh-fd3b1f63a135b13f90af5c6e6516ecfdbfa540e0.tar.xz libssh-fd3b1f63a135b13f90af5c6e6516ecfdbfa540e0.zip |
sftp: Use a declared variable for data len.
CID: #1238632
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Reviewed-by: Aris Adamantiadis <aris@0xbadc0de.be>
(cherry picked from commit ce02f6576aaa29ca6c1ccae010a0c2d4e37f26b2)
-rw-r--r-- | src/sftp.c | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -1749,6 +1749,7 @@ ssize_t sftp_read(sftp_file handle, void *buf, size_t count) { sftp_message msg = NULL; sftp_status_message status; ssh_string datastring; + size_t datalen; ssh_buffer buffer; int id; @@ -1819,19 +1820,19 @@ ssize_t sftp_read(sftp_file handle, void *buf, size_t count) { return -1; } - if (ssh_string_len(datastring) > count) { + datalen = ssh_string_len(datastring); + if (datalen > count) { ssh_set_error(sftp->session, SSH_FATAL, "Received a too big DATA packet from sftp server: " "%" PRIdS " and asked for %" PRIdS, - ssh_string_len(datastring), count); + datalen, count); ssh_string_free(datastring); return -1; } - count = ssh_string_len(datastring); - handle->offset += count; - memcpy(buf, ssh_string_data(datastring), count); + handle->offset += (uint64_t)datalen; + memcpy(buf, ssh_string_data(datastring), datalen); ssh_string_free(datastring); - return count; + return datalen; default: ssh_set_error(sftp->session, SSH_FATAL, "Received message %d during read!", msg->packet_type); |