mirror of
https://github.com/jarun/nnn.git
synced 2024-09-11 04:55:25 +03:00
Merge pull request #1769 from N-R-K/fix-helpstr
fix buffer overflow on certain platforms
This commit is contained in:
commit
485079d3ec
@ -5160,6 +5160,7 @@ static void show_help(const char *path)
|
||||
"cT Set time type%110 Lock\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();
|
||||
if (fd == -1)
|
||||
@ -5170,7 +5171,7 @@ static void show_help(const char *path)
|
||||
get_output(prog, NULL, NULL, fd, FALSE);
|
||||
|
||||
bool hex = true;
|
||||
char *w = g_buf;
|
||||
char *w = help_buf;
|
||||
const char *end = helpstr + (sizeof helpstr - 1);
|
||||
for (const char *s = helpstr; s < end; ++s) {
|
||||
if (hex) {
|
||||
@ -5184,7 +5185,8 @@ static void show_help(const char *path)
|
||||
}
|
||||
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");
|
||||
for (uchar_t i = 0; i < CTX_MAX; ++i)
|
||||
|
Loading…
Reference in New Issue
Block a user