Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

esh: fix double-free with globs

Browse Source
This commit is contained in:
K. Lange 2019-02-27 21:38:09 +09:00
parent 52d65d3099
commit 3e46645b99
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/sh.c
View File

@ -1189,6 +1189,8 @@ _done:
list_t * extra_env = list_create();
list_t * glob_args = list_create();
int i = 0;
foreach(node, args) {
char * c = node->value;
@ -1301,6 +1303,7 @@ _done:
if (!strcmp(after,&t[strlen(t)-strlen(after)])) {
char * out = malloc(strlen(s) + 2 + strlen(prepend));
sprintf(out,"%s%s%s", prepend, !!*prepend ? "/" : "", s);
list_insert(glob_args, out);
argv[i] = out;
i++;
argcs[cmdi]++;
@ -1309,6 +1312,7 @@ _done:
} else {
char * out = malloc(strlen(s) + 2 + strlen(prepend));
sprintf(out,"%s%s%s", prepend, !!*prepend ? "/" : "", s);
list_insert(glob_args, out);
argv[i] = out;
i++;
argcs[cmdi]++;
@ -1331,8 +1335,6 @@ _nope:
argv[i] = c;
i++;
argcs[cmdi]++;
} else {
free(c);
}
}
} else {
@ -1343,6 +1345,13 @@ _nope:
}
argv[i] = NULL;
/* Ensure globs get freed */
foreach(node, glob_args) {
list_insert(args, node->value);
}
list_free(glob_args);
free(glob_args);
if (i == 0) {
add_environment(extra_env);
list_free(extra_env);