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

sftp: Use ssh_buffer_pack() in sftp_readdir()

Browse Source 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
(cherry picked from commit 3a729829fd)
This commit is contained in:
Andreas Schneider
2018-08-31 18:28:15 +02:00
parent fdb6dc7069
commit 4256936fed
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/sftp.c
View File

@@ -1401,27 +1401,23 @@ sftp_attributes sftp_readdir(sftp_session sftp, sftp_dir dir)
return NULL;
}
rc = ssh_buffer_allocate_size(payload,
sizeof(uint32_t) * 2 +
ssh_string_len(dir->handle));
if (rc < 0) {
ssh_set_error_oom(sftp->session);
ssh_buffer_free(payload);
return NULL;
}
id = sftp_get_new_id(sftp);
if (ssh_buffer_add_u32(payload, htonl(id)) < 0 ||
ssh_buffer_add_ssh_string(payload, dir->handle) < 0) {
rc = ssh_buffer_pack(payload,
"dS",
id,
dir->handle);
if (rc != 0) {
ssh_set_error_oom(sftp->session);
ssh_buffer_free(payload);
return NULL;
}
if (sftp_packet_write(sftp, SSH_FXP_READDIR, payload) < 0) {
ssh_buffer_free(payload);
rc = sftp_packet_write(sftp, SSH_FXP_READDIR, payload);
ssh_buffer_free(payload);
if (rc < 0) {
return NULL;
}
ssh_buffer_free(payload);
SSH_LOG(SSH_LOG_PACKET,
"Sent a ssh_fxp_readdir with id %d", id);