You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
89 lines
3.0 KiB
89 lines
3.0 KiB
# --- SDE-COPYRIGHT-NOTE-BEGIN --- |
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|
# |
|
# Filename: package/.../make/make-3.82-0006-construct-command-line.patch |
|
# Copyright (C) 2012 The OpenSDE Project |
|
# |
|
# More information can be found in the files COPYING and README. |
|
# |
|
# This patch file is dual-licensed. It is available under the license the |
|
# patched project is licensed under, as long as it is an OpenSource license |
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|
# of the GNU General Public License as published by the Free Software |
|
# Foundation; either version 2 of the License, or (at your option) any later |
|
# version. |
|
# --- SDE-COPYRIGHT-NOTE-END --- |
|
|
|
From 12e4f0b3019ddd621147358500e87b91ac6361cf Mon Sep 17 00:00:00 2001 |
|
From: Christian Wiese <[email protected]> |
|
Date: Mon, 22 Oct 2012 18:03:56 +0200 |
|
Subject: [PATCH] construct command line |
|
|
|
ChangeLog: |
|
|
|
2011-05-07 Eli Zaretskii <[email protected]> |
|
|
|
* job.c (construct_command_argv_internal): Don't assume shellflags |
|
is always non-NULL. Escape-protect characters special to the |
|
shell when copying the value of SHELL into new_line. Fixes |
|
Savannah bug #23922. |
|
--- |
|
job.c | 23 ++++++++++++++++------- |
|
1 files changed, 16 insertions(+), 7 deletions(-) |
|
|
|
diff --git a/job.c b/job.c |
|
index aacfb84..535a751 100644 |
|
--- a/job.c |
|
+++ b/job.c |
|
@@ -2792,12 +2792,12 @@ construct_command_argv_internal (char *line, char **restp, char *shell, |
|
|
|
unsigned int shell_len = strlen (shell); |
|
unsigned int line_len = strlen (line); |
|
- unsigned int sflags_len = strlen (shellflags); |
|
+ unsigned int sflags_len = shellflags ? strlen (shellflags) : 0; |
|
char *command_ptr = NULL; /* used for batch_mode_shell mode */ |
|
char *new_line; |
|
|
|
# ifdef __EMX__ /* is this necessary? */ |
|
- if (!unixy_shell) |
|
+ if (!unixy_shell && shellflags) |
|
shellflags[0] = '/'; /* "/c" */ |
|
# endif |
|
|
|
@@ -2859,19 +2859,28 @@ construct_command_argv_internal (char *line, char **restp, char *shell, |
|
|
|
new_argv = xmalloc (4 * sizeof (char *)); |
|
new_argv[0] = xstrdup(shell); |
|
- new_argv[1] = xstrdup(shellflags); |
|
+ new_argv[1] = xstrdup(shellflags ? shellflags : ""); |
|
new_argv[2] = line; |
|
new_argv[3] = NULL; |
|
return new_argv; |
|
} |
|
|
|
- new_line = alloca (shell_len + 1 + sflags_len + 1 |
|
+ new_line = alloca ((shell_len*2) + 1 + sflags_len + 1 |
|
+ (line_len*2) + 1); |
|
ap = new_line; |
|
- memcpy (ap, shell, shell_len); |
|
- ap += shell_len; |
|
+ /* Copy SHELL, escaping any characters special to the shell. If |
|
+ we don't escape them, construct_command_argv_internal will |
|
+ recursively call itself ad nauseam, or until stack overflow, |
|
+ whichever happens first. */ |
|
+ for (p = shell; *p != '\0'; ++p) |
|
+ { |
|
+ if (strchr (sh_chars, *p) != 0) |
|
+ *(ap++) = '\\'; |
|
+ *(ap++) = *p; |
|
+ } |
|
*(ap++) = ' '; |
|
- memcpy (ap, shellflags, sflags_len); |
|
+ if (shellflags) |
|
+ memcpy (ap, shellflags, sflags_len); |
|
ap += sflags_len; |
|
*(ap++) = ' '; |
|
command_ptr = ap; |
|
-- |
|
1.7.2.3 |
|
|
|
|