mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2025-02-26 03:01:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add check for max val len in key:val pair

Browse source
This commit is contained in:
Arun Prakash Jana 2020-01-12 08:40:33 +05:30
parent b70a54d47e
commit 7718f77069
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/nnn.c
View file

@ -2507,7 +2507,7 @@ static int xlink(char *prefix, char *path, char *curfname, char *buf, int *prese
return count; return count;
} }
static bool parsekvpair(kv *kvarr, char **envcpy, const char *cfgstr, uchar maxitems) static bool parsekvpair(kv *kvarr, char **envcpy, const char *cfgstr, uchar maxitems, size_t maxlen)
{ {
int i = 0; int i = 0;
char *nextkey; char *nextkey;
@ -2549,6 +2549,10 @@ static bool parsekvpair(kv *kvarr, char **envcpy, const char *cfgstr, uchar maxi
kvarr[i].key = '\0'; kvarr[i].key = '\0';
} }
for (i = 0; i < maxitems && kvarr[i].key; ++i)
if (strlen(kvarr[i].val) >= maxlen)
return FALSE;
return TRUE; return TRUE;
} }
@ -5932,13 +5936,13 @@ int main(int argc, char *argv[])
DPRINTF_S(opener); DPRINTF_S(opener);
/* Parse bookmarks string */ /* Parse bookmarks string */
if (!parsekvpair(bookmark, &bmstr, env_cfg[NNN_BMS], BM_MAX)) { if (!parsekvpair(bookmark, &bmstr, env_cfg[NNN_BMS], BM_MAX, PATH_MAX)) {
fprintf(stderr, "%s\n", env_cfg[NNN_BMS]); fprintf(stderr, "%s\n", env_cfg[NNN_BMS]);
return _FAILURE; return _FAILURE;
} }
/* Parse plugins string */ /* Parse plugins string */
if (!parsekvpair(plug, &pluginstr, "NNN_PLUG", PLUGIN_MAX)) { if (!parsekvpair(plug, &pluginstr, "NNN_PLUG", PLUGIN_MAX, PATH_MAX)) {
fprintf(stderr, "%s\n", "NNN_PLUG"); fprintf(stderr, "%s\n", "NNN_PLUG");
return _FAILURE; return _FAILURE;
} }