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

resolve_editor: sudoers_gc_remove(editor) before freeing it.

Browse Source
This commit is contained in:
Todd C. Miller
2021-08-11 07:45:26 -06:00
parent ef91b90ad6
commit ffdd7920cd
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/sudoers/editor.c
View File

@@ -151,6 +151,7 @@ resolve_editor(const char *ed, size_t edlen, int nfiles, char **files,
/* If we can't find the editor in the user's PATH, give up. */ /* If we can't find the editor in the user's PATH, give up. */
if (find_path(editor, &editor_path, &user_editor_sb, getenv("PATH"), NULL, if (find_path(editor, &editor_path, &user_editor_sb, getenv("PATH"), NULL,
0, allowlist) != FOUND) { 0, allowlist) != FOUND) {
sudoers_gc_remove(GC_PTR, editor);
free(editor); free(editor);
errno = ENOENT; errno = ENOENT;
debug_return_str(NULL); debug_return_str(NULL);
@@ -187,6 +188,7 @@ resolve_editor(const char *ed, size_t edlen, int nfiles, char **files,
debug_return_str(editor_path); debug_return_str(editor_path);
oom: oom:
sudo_warnx(U_("%s: %s"), __func__, U_("unable to allocate memory")); sudo_warnx(U_("%s: %s"), __func__, U_("unable to allocate memory"));
sudoers_gc_remove(GC_PTR, editor);
free(editor); free(editor);
free(editor_path); free(editor_path);
if (nargv != NULL) { if (nargv != NULL) {
@@ -259,5 +261,6 @@ find_editor(int nfiles, char **files, int *argc_out, char ***argv_out,
} }
} }
/* Caller is responsible for freeing editor_path, not g/c'd. */
debug_return_str(editor_path); debug_return_str(editor_path);
} }