From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 20 Jul 2005 21:57:28 +0000 (+0000)
Subject: updated for version 7.0111
X-Git-Tag: v7.0111~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0e634daa954bbdf882575a15a746edf325420cee;p=vim

updated for version 7.0111
---

diff --git a/src/os_unix.c b/src/os_unix.c
index 01b6fad0a..9881d4a80 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -5083,14 +5083,16 @@ mch_expand_wildcards(num_pat, pat, num_file, file, flags)
     if (!have_wildcard(num_pat, pat))
 	return save_patterns(num_pat, pat, num_file, file);
 
+# ifdef HAVE_SANDBOX
+    /* Don't allow any shell command in the sandbox. */
+    if (sandbox != 0 && check_secure())
+	return FAIL;
+# endif
+
     /*
      * Don't allow the use of backticks in secure and restricted mode.
      */
-    if (secure || restricted
-# ifdef HAVE_SANDBOX
-	    || sandbox != 0
-# endif
-       )
+    if (secure || restricted)
 	for (i = 0; i < num_pat; ++i)
 	    if (vim_strchr(pat[i], '`') != NULL
 		    && (check_restricted() || check_secure()))