From 7c4a8f3b51b32858bf34a062bb7215ec40424b7f Mon Sep 17 00:00:00 2001
From: James McDonald <james@jamesmcdonald.com>
Date: Thu, 23 Apr 2015 21:20:16 +0200
Subject: [PATCH] Fix stat patch to use lstat(2) and fix logic

---
 kbfunc.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/kbfunc.c b/kbfunc.c
index fb71f2e..476f570 100644
--- a/kbfunc.c
+++ b/kbfunc.c
@@ -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);
 		}