shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-04 20:30:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

sftp: Use a declared variable for data len.

Browse Source 
CID: #1238632

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Reviewed-by: Aris Adamantiadis <aris@0xbadc0de.be>
(cherry picked from commit ce02f6576a)
This commit is contained in:
Andreas Schneider
2015-01-14 11:07:30 +01:00
parent 914f8abde8
commit fd3b1f63a1
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/sftp.c
View File

@@ -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);