mirrors
/
nnn
mirror of https://github.com/jarun/nnn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Catch NULL from malloc() (#438) 

* Catch NULL from malloc()

* Tidy up errors

* Make indentaion look pretty in git
This commit is contained in:
KlzXS 2020-01-14 23:35:26 +01:00 committed by Mischievous Meerkat
parent b1c9f4ed45
commit 4930f34c3f
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/nnn.c
View File

@ -1675,7 +1675,14 @@ static void get_archive_cmd(char *cmd, char *archive)
static void archive_selection(const char *cmd, const char *archive, const char *curpath)
{
char *buf = (char *)malloc(CMD_LEN_MAX * sizeof(char));
/* The 70 comes from the string below */
char *buf = (char *)malloc((70 + strlen(cmd) + strlen(archive)
+ strlen(curpath) + strlen(g_selpath)) * sizeof(char));
if (!buf) {
DPRINTF_S(strerror(errno));
printwarn(NULL);
return;
}
snprintf(buf, CMD_LEN_MAX,
#ifdef __linux__
@ -2628,8 +2635,13 @@ static char *get_kv_val(kv *kvarr, char *buf, int key, uchar max, bool path)
ssize_t len = strlen(home);
ssize_t loclen = strlen(kvarr[r].val);
if (!buf)
if (!buf) {
buf = (char *)malloc(len + loclen);
if (!buf) {
DPRINTF_S(strerror(errno));
return NULL;
}
}
xstrlcpy(buf, home, len + 1);
xstrlcpy(buf + len, kvarr[r].val + 1, loclen);
@ -5841,6 +5853,11 @@ static bool setup_config(void)
if (!cfg.picker) {
/* Length of "/.config/nnn/.selection" */
g_selpath = (char *)malloc(len + 3);
if (!g_selpath) {
xerror();
return FALSE;
}
r = xstrlcpy(g_selpath, cfgdir, len + 3);
xstrlcpy(g_selpath + r - 1, "/.selection", 12);
DPRINTF_S(g_selpath);