From 02a4d82e8c19267ad06b08389b5e914ba668450e Mon Sep 17 00:00:00 2001 From: Yuri Pudgorodskiy Date: Thu, 12 Nov 2015 16:36:20 +0300 Subject: qga: fix for default env processing for guest-exec envp == NULL must be passed inside gspawn() if it was not passed with the command line. Original code inherits environment from the QGA, which is wrong. Signed-off-by: Yuri Pudgorodskiy Signed-off-by: Denis V. Lunev CC: Michael Roth Signed-off-by: Michael Roth --- qga/commands.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qga/commands.c') diff --git a/qga/commands.c b/qga/commands.c index 0f80ce65a4..7644ca053a 100644 --- a/qga/commands.c +++ b/qga/commands.c @@ -398,7 +398,7 @@ GuestExec *qmp_guest_exec(const char *path, arglist.next = has_arg ? arg : NULL; argv = guest_exec_get_args(&arglist, true); - envp = guest_exec_get_args(has_env ? env : NULL, false); + envp = has_env ? guest_exec_get_args(env, false) : NULL; flags = G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD; if (!has_output) { -- cgit v1.2.1