isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid using exiting allocators in the front end.

Browse Source
This commit is contained in:
Todd C. Miller
2015-06-17 17:00:54 -06:00
parent 5ce50a885c
commit cb63ca701c
19 changed files with 422 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/env_hooks.c
View File

@@ -115,7 +115,9 @@ rpl_putenv(PUTENV_CONST char *string)
/* Append at the end if not already found. */
if (!found) {
size_t env_len = (size_t)(ep - environ);
char **envp = sudo_ereallocarray(priv_environ, env_len + 2, sizeof(char *));
char **envp = reallocarray(priv_environ, env_len + 2, sizeof(char *));
if (envp == NULL)
return -1;
if (environ != priv_environ)
memcpy(envp, environ, env_len * sizeof(char *));
envp[env_len++] = (char *)string;
@@ -190,7 +192,11 @@ rpl_setenv(const char *var, const char *val, int overwrite)
free(envstr);
return 0;
}
return rpl_putenv(envstr);
if (rpl_putenv(envstr) == -1) {
free(envstr);
return -1;
}
return 0;
}
typedef int (*sudo_fn_setenv_t)(const char *, const char *, int);