Skip to content

Commit 20c24dc

Browse files
committed
Do not run omc with shell=True
1 parent 18142a1 commit 20c24dc

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

OMPython/__init__.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import platform
1818
import psutil
1919
import re
20-
import shlex
2120
import signal
2221
import subprocess
2322
import sys
@@ -188,7 +187,7 @@ def _start_omc_process(self, timeout):
188187
my_env = os.environ.copy()
189188
my_env["USER"] = self._currentUser
190189
# Because we spawned a shell, and we need to be able to kill OMC, create a new process group for this
191-
self._omc_process = subprocess.Popen(self._omc_command, shell=True, stdout=self._omc_log_file, stderr=self._omc_log_file, env=my_env, preexec_fn=os.setsid)
190+
self._omc_process = subprocess.Popen(self._omc_command, stdout=self._omc_log_file, stderr=self._omc_log_file, env=my_env, preexec_fn=os.setsid)
192191
if self._docker:
193192
for i in range(0, 40):
194193
try:
@@ -271,12 +270,7 @@ def _set_omc_command(self, omc_path_and_args_list):
271270
if self._interactivePort:
272271
extraFlags = extraFlags + ["--interactivePort=%d" % int(self._interactivePort)]
273272

274-
omc_path_and_args_list = omcCommand + omc_path_and_args_list + extraFlags
275-
276-
if sys.platform == 'win32':
277-
self._omc_command = omc_path_and_args_list
278-
else:
279-
self._omc_command = ' '.join([shlex.quote(a) for a in omc_path_and_args_list])
273+
self._omc_command = omcCommand + omc_path_and_args_list + extraFlags
280274

281275
return self._omc_command
282276

0 commit comments

Comments
 (0)