mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2025-01-12 16:40:27 +00:00
Code Issues 1 Releases Wiki Activity

Make os/execute not leak memory on panics.

Browse Source 
Since many calls can panic, it's best
to only use scratch memory for temporary values.
This commit is contained in:
Calvin Rose 2019-06-01 23:38:10 -04:00
parent c150f2f2c1
commit e697cc3811
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/os.c
View File

@ -129,10 +129,7 @@ static char **os_execute_env(int32_t argc, const Janet *argv) {
char **envp = NULL; char **envp = NULL;
if (argc > 2) { if (argc > 2) {
JanetDictView dict = janet_getdictionary(argv, 2); JanetDictView dict = janet_getdictionary(argv, 2);
envp = malloc(sizeof(char *) * (dict.len + 1)); envp = janet_smalloc(sizeof(char *) * (dict.len + 1));
if (NULL == envp) {
JANET_OUT_OF_MEMORY;
}
int32_t j = 0; int32_t j = 0;
for (int32_t i = 0; i < dict.cap; i++) { for (int32_t i = 0; i < dict.cap; i++) {
const JanetKV *kv = dict.kvs + i; const JanetKV *kv = dict.kvs + i;
@ -151,10 +148,7 @@ static char **os_execute_env(int32_t argc, const Janet *argv) {
} }
} }
if (skip) continue; if (skip) continue;
char *envitem = malloc(klen + vlen + 2); char *envitem = janet_smalloc(klen + vlen + 2);
if (NULL == envitem) {
JANET_OUT_OF_MEMORY;
}
memcpy(envitem, keys, klen); memcpy(envitem, keys, klen);
envitem[klen] = '='; envitem[klen] = '=';
memcpy(envitem + klen + 1, vals, vlen); memcpy(envitem + klen + 1, vals, vlen);
@ -171,16 +165,16 @@ static void os_execute_cleanup(char **envp, const char **child_argv) {
#ifdef JANET_WINDOWS #ifdef JANET_WINDOWS
(void) child_argv; (void) child_argv;
#else #else
free((void *)child_argv); janet_sfree((void *)child_argv);
#endif #endif
if (NULL != envp) { if (NULL != envp) {
char **envitem = envp; char **envitem = envp;
while (*envitem != NULL) { while (*envitem != NULL) {
free(*envitem); janet_sfree(*envitem);
envitem++; envitem++;
} }
} }
free(envp); janet_sfree(envp);
} }
#ifdef JANET_WINDOWS #ifdef JANET_WINDOWS
@ -313,13 +307,9 @@ static Janet os_execute(int32_t argc, Janet *argv) {
return janet_wrap_integer(status); return janet_wrap_integer(status);
#else #else
const char **child_argv = malloc(sizeof(char *) * (exargs.len + 1)); const char **child_argv = janet_smalloc(sizeof(char *) * (exargs.len + 1));
if (NULL == child_argv) { for (int32_t i = 0; i < exargs.len; i++)
JANET_OUT_OF_MEMORY;
}
for (int32_t i = 0; i < exargs.len; i++) {
child_argv[i] = janet_getcstring(exargs.items, i); child_argv[i] = janet_getcstring(exargs.items, i);
}
child_argv[exargs.len] = NULL; child_argv[exargs.len] = NULL;
/* Coerce to form that works for spawn. I'm fairly confident no implementation /* Coerce to form that works for spawn. I'm fairly confident no implementation
* of posix_spawn would modify the argv array passed in. */ * of posix_spawn would modify the argv array passed in. */