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

Drop path validation

This commit is contained in:
Arun Prakash Jana 2020-03-01 17:25:49 +05:30
parent ad9f834b64
commit 1224270104
No known key found for this signature in database
GPG Key ID: A75979F35C080412
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/nnn.c
View File

@ -2918,7 +2918,7 @@ static bool parsekvpair(kv **arr, char **envcpy, const uchar id, ushort *items)
if (!maxitems) if (!maxitems)
return FALSE; return FALSE;
*arr = calloc(maxitems, sizeof(kv)); *arr = malloc(maxitems * sizeof(kv));
if (!arr) { if (!arr) {
xerror(); xerror();
return FALSE; return FALSE;
@ -2966,9 +2966,10 @@ static bool parsekvpair(kv **arr, char **envcpy, const uchar id, ushort *items)
if (kvarr[i - 1].val && *kvarr[i - 1].val == '\0') if (kvarr[i - 1].val && *kvarr[i - 1].val == '\0')
return FALSE; return FALSE;
for (i = 0; i < maxitems && kvarr[i].key; ++i) /* Redundant check so far, all paths will get evaluated and fail */
if (strlen(kvarr[i].val) >= PATH_MAX) //for (i = 0; i < maxitems && kvarr[i].key; ++i)
return FALSE; // if (strlen(kvarr[i].val) >= PATH_MAX)
// return FALSE;
*items = maxitems; *items = maxitems;
return TRUE; return TRUE;
@ -2980,7 +2981,7 @@ static bool parsekvpair(kv **arr, char **envcpy, const uchar id, ushort *items)
* NULL is returned in case of no match, path resolution failure etc. * NULL is returned in case of no match, path resolution failure etc.
* buf would be modified, so check return value before access * buf would be modified, so check return value before access
*/ */
static char *get_kv_val(kv *kvarr, char *buf, int key, uchar max, bool path) static char *get_kv_val(kv *kvarr, char *buf, int key, uchar max, bool bookmark)
{ {
int r = 0; int r = 0;
@ -2989,7 +2990,8 @@ static char *get_kv_val(kv *kvarr, char *buf, int key, uchar max, bool path)
for (; kvarr[r].key && r < max; ++r) { for (; kvarr[r].key && r < max; ++r) {
if (kvarr[r].key == key) { if (kvarr[r].key == key) {
if (!path) /* Do not allocate new memory for plugin */
if (!bookmark)
return kvarr[r].val; return kvarr[r].val;
if (kvarr[r].val[0] == '~') { if (kvarr[r].val[0] == '~') {