Pārlūkot izejas kodu

Fix #786: memccpy() detects buffer overlap on macOS

master
Arun Prakash Jana pirms 3 gadiem
vecāks
revīzija
a443a321ef
Šim parakstam datu bāzē netika atrasta zināma atslēga GPG atslēgas ID: A75979F35C080412
1 mainītis faili ar 8 papildinājumiem un 2 dzēšanām
  1. +8
    -2
      src/nnn.c

+ 8
- 2
src/nnn.c Parādīt failu

@@ -1016,6 +1016,8 @@ static inline bool getutil(char *util)
/*
* Updates out with "dir/name or "/name"
* Returns the number of bytes copied including the terminating NULL byte
*
* Note: dir and out must be PATH_MAX in length to avoid macOS fault
*/
static size_t mkpath(const char *dir, const char *name, char *out)
{
@@ -4710,10 +4712,14 @@ static bool run_cmd_as_plugin(const char *file, char *runfile, uchar flags)

static bool plctrl_init(void)
{
snprintf(g_buf, CMD_LEN_MAX, "nnn-pipe.%d", getpid());
size_t len;

/* g_tmpfpath is used to generate tmp file names */
g_tmpfpath[tmpfplen - 1] = '\0';
mkpath(g_tmpfpath, g_buf, g_pipepath);
len = xstrsncpy(g_pipepath, g_tmpfpath, TMP_LEN_MAX);
g_pipepath[len - 1] = '/';
len = xstrsncpy(g_pipepath + len, "nnn-pipe.", TMP_LEN_MAX - len) + len;
xstrsncpy(g_pipepath + len - 1, xitoa(getpid()), TMP_LEN_MAX - len);
setenv(env_cfg[NNN_PIPE], g_pipepath, TRUE);

return EXIT_SUCCESS;


Notiek ielāde…
Atcelt
Saglabāt