Skip to content

vfs/sftpfs: Always zero-initialize struct stat and set st_blksize #5169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tuffnatty wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −4
Open

vfs/sftpfs: Always zero-initialize struct stat and set st_blksize #5169

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/vfs/sftpfs/internal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,8 @@ sftpfs_op_init (sftpfs_super_t **super, const vfs_path_element_t **path_element,
void
sftpfs_attr_to_stat (const LIBSSH2_SFTP_ATTRIBUTES *attrs, struct stat *s)
{
memset (s, 0, sizeof (struct stat));

if ((attrs->flags & LIBSSH2_SFTP_ATTR_UIDGID) != 0)
{
s->st_uid = attrs->uid;
Expand All @@ -263,10 +265,9 @@ sftpfs_attr_to_stat (const LIBSSH2_SFTP_ATTRIBUTES *attrs, struct stat *s)
}

if ((attrs->flags & LIBSSH2_SFTP_ATTR_SIZE) != 0)
{
s->st_size = attrs->filesize;
sftpfs_blksize (s);
}

sftpfs_blksize (s);

if ((attrs->flags & LIBSSH2_SFTP_ATTR_PERMISSIONS) != 0)
s->st_mode = attrs->permissions;
Expand Down Expand Up @@ -321,8 +322,8 @@ sftpfs_stat (const vfs_path_t *vpath, struct stat *buf, GError **mcerror)
res = sftpfs_stat_init (&super, &path_element, vpath, mcerror, LIBSSH2_SFTP_STAT, &attrs);
if (res >= 0)
{
buf->st_nlink = 1;
Comment thread
tuffnatty marked this conversation as resolved.
sftpfs_attr_to_stat (&attrs, buf);
buf->st_nlink = 1;
res = 0;
}

Expand Down
Loading