Skip to content

Commit dcba967

Browse files
committed
upstream: another ruser_name/ruser_group vs attrib_to_stat() ordering
screwup. Coverity CID 910530 via dtucker@ OpenBSD-Commit-ID: d8c4656119f09304e79fcf2ab32299ed68006a29
1 parent 710cd5a commit dcba967

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

sftp.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $OpenBSD: sftp.c,v 1.256 2026/06/30 00:10:48 djm Exp $ */
1+
/* $OpenBSD: sftp.c,v 1.257 2026/06/30 02:30:19 djm Exp $ */
22
/*
33
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
44
*
@@ -901,12 +901,12 @@ do_ls_dir(struct sftp_conn *conn, const char *path,
901901
struct stat sb;
902902
const char *user = NULL, *group = NULL;
903903

904+
memset(&sb, 0, sizeof(sb));
905+
attrib_to_stat(&d[n]->a, &sb);
904906
if ((lflag & LS_NUMERIC_VIEW) == 0) {
905907
user = ruser_name(sb.st_uid);
906908
group = rgroup_name(sb.st_gid);
907909
}
908-
memset(&sb, 0, sizeof(sb));
909-
attrib_to_stat(&d[n]->a, &sb);
910910
lname = ls_file(fname, &sb, 1,
911911
(lflag & LS_SI_UNITS), user, group);
912912
mprintf("%s\n", lname);

0 commit comments

Comments
 (0)