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

sftp: Use ssh_buffer_unpack() in sftp_canonicalize_path()

Browse Source 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
(cherry picked from commit 336c097ae7)
This commit is contained in:
Andreas Schneider
2018-08-31 19:34:08 +02:00
parent c3987a9796
commit 4eb759bf40
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/sftp.c
View File

@@ -2988,10 +2988,7 @@ char *sftp_canonicalize_path(sftp_session sftp, const char *path)
{ {
sftp_status_message status = NULL; sftp_status_message status = NULL;
sftp_message msg = NULL; sftp_message msg = NULL;
ssh_string name = NULL;
ssh_buffer buffer; ssh_buffer buffer;
char *cname;
uint32_t ignored;
uint32_t id; uint32_t id;
int rc; int rc;
@@ -3034,20 +3031,21 @@ char *sftp_canonicalize_path(sftp_session sftp, const char *path)
} }
if (msg->packet_type == SSH_FXP_NAME) { if (msg->packet_type == SSH_FXP_NAME) {
/* we don't care about "count" */ uint32_t ignored = 0;
ssh_buffer_get_u32(msg->payload, &ignored); char *cname = NULL;
/* we only care about the file name string */
name = ssh_buffer_get_ssh_string(msg->payload); rc = ssh_buffer_unpack(msg->payload,
"ds",
ignored,
cname);
sftp_message_free(msg); sftp_message_free(msg);
if (name == NULL) { if (rc != SSH_OK) {
/* TODO: error message? */ ssh_set_error(sftp->session,
SSH_ERROR,
"Failed to parse canonicalized path");
return NULL; return NULL;
} }
cname = ssh_string_to_char(name);
ssh_string_free(name);
if (cname == NULL) {
ssh_set_error_oom(sftp->session);
}
return cname; return cname;
} else if (msg->packet_type == SSH_FXP_STATUS) { /* bad response (error) */ } else if (msg->packet_type == SSH_FXP_STATUS) { /* bad response (error) */
status = parse_status_msg(msg); status = parse_status_msg(msg);