mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-02-06 05:51:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3164 from pwithnall/dbus-unix-fds

Browse Source 
session-helper: Correctly annotate use of Unix FDs in D-Bus API
This commit is contained in:
Matthias Clasen
2019-10-10 07:54:43 -04:00
committed by GitHub
parent 3a03e7f292 23e1928a19
commit 03ef120aea
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/org.freedesktop.Flatpak.xml
View File

@@ -41,6 +41,7 @@
to do this. For instance for developer tools this lets you
build flatpaks from inside a flatpak. -->
<method name="HostCommand">
<annotation name="org.gtk.GDBus.C.UnixFD" value="true"/>
<arg type='ay' name='cwd_path' direction='in'/>
<arg type='aay' name='argv' direction='in'/>
<arg type='a{uh}' name='fds' direction='in'/>

5
session-helper/flatpak-session-helper.c
View File

@@ -201,6 +201,7 @@ child_setup_func (gpointer user_data)
static gboolean
handle_host_command (FlatpakDevelopment *object,
GDBusMethodInvocation *invocation,
GUnixFDList *fd_list,
const gchar *arg_cwd_path,
const gchar *const *arg_argv,
GVariant *arg_fds,
@@ -208,8 +209,6 @@ handle_host_command (FlatpakDevelopment *object,
guint flags)
{
g_autoptr(GError) error = NULL;
GDBusMessage *message = g_dbus_method_invocation_get_message (invocation);
GUnixFDList *fd_list = g_dbus_message_get_unix_fd_list (message);
ChildSetupData child_setup_data = { NULL };
GPid pid;
PidData *pid_data;
@@ -362,7 +361,7 @@ handle_host_command (FlatpakDevelopment *object,
pid_data);
flatpak_development_complete_host_command (object, invocation,
flatpak_development_complete_host_command (object, invocation, NULL,
pid_data->pid);
return TRUE;
}