nnn

commit 98042ad7d07dfa4f7d03d3f7b43bbd72cf3a05c6
parent 43c636d95c6ac835c1a92bcabe4297268fd41aa9
Author: Sijmen J. Mulder <ik@sjmulder.nl>
Date:   Wed, 16 Oct 2019 03:31:19 +0200

Fix strftime() buffer overflow (#362)

If the formatted string is longer than 17 characters the string won't
be null terminated, causing gibberish to be printed on the status line
and possibly worse.

This occurs with my current locale in which a date is printed as such:

  2019-okt.-15 19:26

Which is 18 characters.
Diffstat:
M
src/nnn.c
 | 
10
++++++----

1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/nnn.c b/src/nnn.c
@@ -2530,11 +2530,12 @@ static void printent(const struct entry *ent, int sel, uint namecols)
 
 static void printent_long(const struct entry *ent, int sel, uint namecols)
 {
-	char timebuf[18], permbuf[4], ind1 = '\0', ind2[] = "\0\0";
+	char timebuf[24], permbuf[4], ind1 = '\0', ind2[] = "\0\0";
 	const char cp = (ent->flags & FILE_SELECTED) ? '+' : ' ';
 
 	/* Timestamp */
-	strftime(timebuf, 18, "%F %R", localtime(&ent->t));
+	strftime(timebuf, sizeof(timebuf), "%F %R", localtime(&ent->t));
+	timebuf[sizeof(timebuf)-1] = '\0';
 
 	/* Permissions */
 	permbuf[0] = '0' + ((ent->mode >> 6) & 7);
@@ -3439,7 +3440,7 @@ static void redraw(char *path)
 	int ncols = (xcols <= PATH_MAX) ? xcols : PATH_MAX;
 	int lastln = xlines, onscreen = xlines - 4;
 	int i, attrs;
-	char buf[18];
+	char buf[24];
 	char c;
 	char *ptr = path, *base;
 
@@ -3579,7 +3580,8 @@ static void redraw(char *path)
 			base = unescape(pent->name, NAME_MAX, NULL);
 
 			/* Timestamp */
-			strftime(buf, 18, "%Y-%b-%d %R", localtime(&pent->t));
+			strftime(buf, sizeof(buf), "%Y-%b-%d %R", localtime(&pent->t));
+			buf[sizeof(buf)-1] = '\0';
 
 			mvprintw(lastln, 0, "%d/%d (%d) %s%s %s %s %s [%s]",
 				 cur + 1, ndents, nselected, sort, buf,