From 093115edb9b6591380ba5d5cb1d860b243a6c3b3 Mon Sep 17 00:00:00 2001
From: Andrea Orlati <aorlati@users.noreply.github.com>
Date: Mon, 18 Oct 2021 11:12:04 +0200
Subject: [PATCH] fix issue #610: placeholer char is not properly checked and
 replaced when a system call is invoked (#612)

---
 Common/Libraries/ParserLibrary/include/SP_parser.i | 10 +++++++---
 Common/Libraries/ParserLibrary/src/TestParser.cpp  |  3 ++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Common/Libraries/ParserLibrary/include/SP_parser.i b/Common/Libraries/ParserLibrary/include/SP_parser.i
index 89755fac8..cd02acc50 100644
--- a/Common/Libraries/ParserLibrary/include/SP_parser.i
+++ b/Common/Libraries/ParserLibrary/include/SP_parser.i
@@ -100,9 +100,13 @@ IRA::CString CParser<OBJ>::executeCommand(const IRA::CString& command,IRA::CStri
 			IRA::CString answer("");
 			composeCall+=elem->m_syscall;
 			for (WORD k=0;k<parNum;k++) {
-				composeCall+=" ";
-				composeCall+=inParams[k];
-			}
+         	if (inParams[k]==IRA::CString(_SP_JOLLYCHARACTER)) {
+					composeCall+=_SP_JOLLYCHARACTER_REPLACEMENT;
+				}
+				else {
+					composeCall+=inParams[k];
+            }
+			}			
 			/*if (system((const char *)composeCall)<0) {
 				_EXCPT(ParserErrors::SystemCommandErrorExImpl,err,"CParser::executeCommand()");
 				err.setSystemCommand((const char *)composeCall);
diff --git a/Common/Libraries/ParserLibrary/src/TestParser.cpp b/Common/Libraries/ParserLibrary/src/TestParser.cpp
index d621ddddd..73ee49ba8 100644
--- a/Common/Libraries/ParserLibrary/src/TestParser.cpp
+++ b/Common/Libraries/ParserLibrary/src/TestParser.cpp
@@ -189,7 +189,8 @@ int main(int argc, char *argv[])
 	parser.add("answer",new function2<CTest,constant,void_type,I<string_type>, O<longString_type> >(&test,&CTest::answer),1);
 
 
-	parser.add("naviga","firefox",1);
+	parser.add("naviga","firefox",0);
+	parser.add("terminale","xterm -title ",1);
 
 	parser.add("remoteok","extern",0,&CTest::remoteCall);
 	parser.add("remotefail","extern",1,&CTest::remoteCall);
-- 
GitLab