From 811b2d415f0630f29a928843beb7de7e9e578678 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Wed, 26 Feb 2020 16:56:28 +0000
Subject: [PATCH] runtime: Use self->bubblewrap instead of copying in-progress
 argv

This makes it a bit clearer what's going on.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 src/runtime.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/runtime.c b/src/runtime.c
index cb02a96dc..15d887c39 100644
--- a/src/runtime.c
+++ b/src/runtime.c
@@ -502,7 +502,7 @@ try_bind_dri (PvRuntime *self,
       dest_dri = g_build_filename (libdir_on_host, "dri", NULL);
       temp_bwrap = flatpak_bwrap_new (NULL);
       flatpak_bwrap_add_args (temp_bwrap,
-                              bwrap->argv->pdata[0],
+                              self->bubblewrap,
                               "--ro-bind", "/", "/",
                               "--tmpfs", "/run",
                               "--ro-bind", "/", "/run/host",
@@ -582,7 +582,7 @@ ensure_locales (PvRuntime *self,
                                      NULL);
 
       flatpak_bwrap_add_args (run_locale_gen,
-                              bwrap->argv->pdata[0],
+                              self->bubblewrap,
                               "--ro-bind", "/", "/",
                               NULL);
       pv_bwrap_add_api_filesystems (run_locale_gen);
@@ -1173,7 +1173,7 @@ pv_runtime_use_host_graphics_stack (PvRuntime *self,
 
           temp_bwrap = flatpak_bwrap_new (NULL);
           flatpak_bwrap_add_args (temp_bwrap,
-                                  bwrap->argv->pdata[0],
+                                  self->bubblewrap,
                                   NULL);
 
           if (!pv_bwrap_bind_usr (temp_bwrap,
@@ -1359,7 +1359,7 @@ pv_runtime_use_host_graphics_stack (PvRuntime *self,
 
               temp_bwrap = flatpak_bwrap_new (NULL);
               flatpak_bwrap_add_args (temp_bwrap,
-                                      bwrap->argv->pdata[0],
+                                      self->bubblewrap,
                                       NULL);
 
               if (!pv_bwrap_bind_usr (temp_bwrap,
-- 
GitLab