1From 3fcd042d26d70856e826a42b5f93dc4854d80bf0 Mon Sep 17 00:00:00 2001
2From: Andreas Gruenbacher <agruen@gnu.org>
3Date: Fri, 6 Apr 2018 19:36:15 +0200
4Subject: Invoke ed directly instead of using the shell
5
6* src/pch.c (do_ed_script): Invoke ed directly instead of using a shell
7command to avoid quoting vulnerabilities.
8[Retrieved from:
9https://git.savannah.gnu.org/cgit/patch.git/commit/?id=3fcd042d26d70856e826a42b5f93dc4854d80bf0]
10Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
11---
12 src/pch.c | 6 ++----
13 1 file changed, 2 insertions(+), 4 deletions(-)
14
15diff --git a/src/pch.c b/src/pch.c
16index 4fd5a05..16e001a 100644
17--- a/src/pch.c
18+++ b/src/pch.c
19@@ -2459,9 +2459,6 @@ do_ed_script (char const *inname, char const *outname,
20 	    *outname_needs_removal = true;
21 	    copy_file (inname, outname, 0, exclusive, instat.st_mode, true);
22 	  }
23-	sprintf (buf, "%s %s%s", editor_program,
24-		 verbosity == VERBOSE ? "" : "- ",
25-		 outname);
26 	fflush (stdout);
27
28 	pid = fork();
29@@ -2470,7 +2467,8 @@ do_ed_script (char const *inname, char const *outname,
30 	else if (pid == 0)
31 	  {
32 	    dup2 (tmpfd, 0);
33-	    execl ("/bin/sh", "sh", "-c", buf, (char *) 0);
34+	    assert (outname[0] != '!' && outname[0] != '-');
35+	    execlp (editor_program, editor_program, "-", outname, (char  *) NULL);
36 	    _exit (2);
37 	  }
38 	else
39--
40cgit v1.2.1
41
42