For sudoedit, make a local copy of editor string si become part of

argv.  If no editor environment variable, split def_editor on ':'
since it may be a colon-delimited path.

diff --git a/plugins/sudoers/sudoers.c b/plugins/sudoers/sudoers.c
index c82fb1e5e9b88db93cad8918a6740a0bd26284a0..09a5e501b87da8f5f195d777147ae6267749bbb2 100644 (file)
--- a/plugins/sudoers/sudoers.c
+++ b/plugins/sudoers/sudoers.c
@@ -1351,6 +1351,8 @@ resolve_editor(char *editor, int nfiles, char **files, char ***argv_out)
     char *cp, **nargv, *editor_path = NULL;
     int ac, i, nargc, wasblank;
 
+    editor = estrdup(editor); /* becomes part of argv_out */
+
     /*
      * Split editor into an argument vector; editor is reused (do not free).
      * The EDITOR and VISUAL environment variables may contain command
@@ -1369,6 +1371,7 @@ resolve_editor(char *editor, int nfiles, char **files, char ***argv_out)
     cp = strtok(editor, " \t");
     if (cp == NULL ||
        find_path(cp, &editor_path, NULL, getenv("PATH"), 0) != FOUND) {
+       efree(editor);
        return NULL;
     }
     nargv = (char **) emalloc2(nargc + 1 + nfiles + 1, sizeof(char *));
@@ -1410,10 +1413,15 @@ find_editor(int nfiles, char **files, char ***argv_out)
        }
     }
     if (editor_path == NULL) {
+       /* def_editor could be a path, split it up */
        editor = estrdup(def_editor);
-       if ((cp = strchr(editor, ':')) != NULL)
-           *cp = '\0';                 /* def_editor could be a path */
-       editor_path = resolve_editor(cp, nfiles, files, argv_out);
+       cp = strtok(editor, ":");
+       while (cp != NULL && editor_path == NULL) {
+           editor_path = resolve_editor(cp, nfiles, files, argv_out);
+           cp = strtok(NULL, ":");
+       }
+       if (editor_path)
+           efree(editor);
     }
     if (!editor_path) {
        audit_failure(NewArgv, "%s: command not found", editor);