lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-11-27 13:21:11 +03:00
Code 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>
This commit is contained in:
Andreas Schneider
2015-01-14 11:07:30 +01:00
parent 68e720a3da
commit ce02f6576a
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

@@ -1712,6 +1712,7 @@ ssize_t sftp_read(sftp_file handle, void *buf, size_t count) {
sftp_message msg = NULL; sftp_message msg = NULL;
sftp_status_message status; sftp_status_message status;
ssh_string datastring; ssh_string datastring;
size_t datalen;
ssh_buffer buffer; ssh_buffer buffer;
int id; int id;
int rc; int rc;
@@ -1788,19 +1789,19 @@ ssize_t sftp_read(sftp_file handle, void *buf, size_t count) {
return -1; return -1;
} }
if (ssh_string_len(datastring) > count) { datalen = ssh_string_len(datastring);
if (datalen > count) {
ssh_set_error(sftp->session, SSH_FATAL, ssh_set_error(sftp->session, SSH_FATAL,
"Received a too big DATA packet from sftp server: " "Received a too big DATA packet from sftp server: "
"%" PRIdS " and asked for %" PRIdS, "%" PRIdS " and asked for %" PRIdS,
ssh_string_len(datastring), count); datalen, count);
ssh_string_free(datastring); ssh_string_free(datastring);
return -1; return -1;
} }
count = ssh_string_len(datastring); handle->offset += (uint64_t)datalen;
handle->offset += count; memcpy(buf, ssh_string_data(datastring), datalen);
memcpy(buf, ssh_string_data(datastring), count);
ssh_string_free(datastring); ssh_string_free(datastring);
return count; return datalen;
default: default:
ssh_set_error(sftp->session, SSH_FATAL, ssh_set_error(sftp->session, SSH_FATAL,
"Received message %d during read!", msg->packet_type); "Received message %d during read!", msg->packet_type);