Skip to content

Commit

Permalink
Fix stat patch to use lstat(2) and fix logic
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesmcdonald authored and leahneukirchen committed Apr 23, 2015
1 parent 4cb6e0b commit 7c4a8f3
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions kbfunc.c
Expand Up @@ -280,15 +280,16 @@ kbfunc_exec(struct client_ctx *cc, union arg *arg)
(void)memset(tpath, '\0', sizeof(tpath));
l = snprintf(tpath, sizeof(tpath), "%s/%s", paths[i],
dp->d_name);
if (l == -1 || l >= sizeof(tpath))
continue;
/* skip everything but regular files and symlinks */
if (dp->d_type != DT_REG && dp->d_type != DT_LNK) {
/* use an additional stat-based check in case d_type isn't supported */
stat(tpath, &sb);
if (lstat(tpath, &sb) < 0)
continue;
if (!S_ISREG(sb.st_mode) && !S_ISLNK(sb.st_mode))
continue;
}
if (l == -1 || l >= sizeof(tpath))
continue;
if (access(tpath, X_OK) == 0)
menuq_add(&menuq, NULL, "%s", dp->d_name);
}
Expand Down

0 comments on commit 7c4a8f3

Please sign in to comment.