mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-31 06:15:37 +00:00
Code Issues Releases Wiki Activity

Add garbage collection to resolve_editor().

Browse Source 
Fixes a leak when evaluating the policy multiple times if sudoedit
is set.
This commit is contained in:
Todd C. Miller
2021-08-10 12:58:18 -06:00
parent abac069566
commit 9798fd86bf
5 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/sudoers/editor.c
View File

@@ -101,6 +101,7 @@ copy_arg(const char *src, size_t len)
debug_decl(copy_arg, SUDOERS_DEBUG_UTIL);
if ((copy = malloc(len + 1)) != NULL) {
sudoers_gc_add(GC_PTR, copy);
for (dst = copy; src < src_end; ) {
if (src[0] == '\\' && src[1] != '\0') {
src++;
@@ -163,6 +164,7 @@ resolve_editor(const char *ed, size_t edlen, int nfiles, char **files,
nargv = reallocarray(NULL, nargc + 1, sizeof(char *));
if (nargv == NULL)
goto oom;
sudoers_gc_add(GC_PTR, nargv);
/* Fill in editor argv (assumes files[] is NULL-terminated). */
nargv[0] = editor;
@@ -188,8 +190,11 @@ oom:
free(editor);
free(editor_path);
if (nargv != NULL) {
while (nargc--)
while (nargc--) {
sudoers_gc_remove(GC_PTR, nargv[nargc]);
free(nargv[nargc]);
}
sudoers_gc_remove(GC_PTR, nargv);
free(nargv);
}
debug_return_str(NULL);