From: Robert Swiecki <robert@swiecki.net>
Date: Tue, 5 Dec 2017 14:44:53 +0000 (+0100)
Subject: config.cc: set exec_file only if arg0 is set
X-Git-Tag: 2.3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=af7bfc16aa88b77de84c6124aeb43d57082533bc;p=platform%2Fupstream%2Fnsjail.git

config.cc: set exec_file only if arg0 is set
---

diff --git a/config.cc b/config.cc
index df73e4c..0b2a54c 100644
--- a/config.cc
+++ b/config.cc
@@ -286,6 +286,7 @@ static bool configParseInternal(struct nsjconf_t* nsjconf, const nsjail::NsJailC
 		static std::vector<const char*> argv;
 		if (njc.exec_bin().has_arg0()) {
 			argv.push_back(njc.exec_bin().arg0().c_str());
+			nsjconf->exec_file = njc.exec_bin().path().c_str();
 		} else {
 			argv.push_back(njc.exec_bin().path().c_str());
 		}
@@ -293,7 +294,6 @@ static bool configParseInternal(struct nsjconf_t* nsjconf, const nsjail::NsJailC
 			argv.push_back(njc.exec_bin().arg(i).c_str());
 		}
 		argv.push_back(nullptr);
-		nsjconf->exec_file = DUP_IF_SET(njc.exec_bin(), path);
 		nsjconf->argv = argv.data();
 		nsjconf->use_execveat = njc.exec_bin().exec_fd();
 	}