mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2025-01-15 21:36:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1769 from N-R-K/fix-helpstr

Browse source 
fix buffer overflow on certain platforms
This commit is contained in:
Arun 2023-11-21 22:11:12 +05:30 committed by GitHub
parent 744a7554ef 60eabb6170
commit 485079d3ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/nnn.c
View file

@ -5160,6 +5160,7 @@ static void show_help(const char *path)
"cT Set time type%110 Lock\n" "cT Set time type%110 Lock\n"
"b^L Redraw%18? Help, conf\n" "b^L Redraw%18? Help, conf\n"
}; };
char help_buf[1<<11]; // if editing helpstr, ensure this has enough space to decode it
int fd = create_tmp_file(); int fd = create_tmp_file();
if (fd == -1) if (fd == -1)
@ -5170,7 +5171,7 @@ static void show_help(const char *path)
get_output(prog, NULL, NULL, fd, FALSE); get_output(prog, NULL, NULL, fd, FALSE);
bool hex = true; bool hex = true;
char *w = g_buf; char *w = help_buf;
const char *end = helpstr + (sizeof helpstr - 1); const char *end = helpstr + (sizeof helpstr - 1);
for (const char *s = helpstr; s < end; ++s) { for (const char *s = helpstr; s < end; ++s) {
if (hex) { if (hex) {
@ -5184,7 +5185,8 @@ static void show_help(const char *path)
} }
hex = *s == '\n'; hex = *s == '\n';
} }
if (write(fd, g_buf, w - g_buf)) {} // silence warning ssize_t res = write(fd, help_buf, w - help_buf);
(void)res; // silence warning
dprintf(fd, "\nLOCATIONS\n"); dprintf(fd, "\nLOCATIONS\n");
for (uchar_t i = 0; i < CTX_MAX; ++i) for (uchar_t i = 0; i < CTX_MAX; ++i)