luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-02 13:53:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

gdesktopappinfo: Add a missing NULL check

Browse Source 
It’s possible for the startup ID to be `NULL` if one wasn’t provided in
the platform data passed to `launch_uris_with_dbus()`.

Passing `NULL` to `g_app_launch_context_launch_failed()` causes a
critical warning.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
This commit is contained in:
Philip Withnall 2023-02-03 00:10:41 +00:00
parent 8fbb8dc442
commit 7cd57b3e85
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gio/gdesktopappinfo.c
View File

@ -3157,7 +3157,7 @@ typedef struct
GDesktopAppInfo *info; /* (owned) */ GDesktopAppInfo *info; /* (owned) */
GAppLaunchContext *launch_context; /* (owned) (nullable) */ GAppLaunchContext *launch_context; /* (owned) (nullable) */
GAsyncReadyCallback callback; GAsyncReadyCallback callback;
gchar *startup_id; /* (owned) */ gchar *startup_id; /* (owned) (nullable) */
gpointer user_data; gpointer user_data;
} LaunchUrisWithDBusData; } LaunchUrisWithDBusData;
@ -3182,7 +3182,10 @@ launch_uris_with_dbus_signal_cb (GObject *object,
if (data->launch_context) if (data->launch_context)
{ {
if (g_task_had_error (G_TASK (result))) if (g_task_had_error (G_TASK (result)))
g_app_launch_context_launch_failed (data->launch_context, data->startup_id); {
if (data->startup_id != NULL)
g_app_launch_context_launch_failed (data->launch_context, data->startup_id);
}
else else
{ {
GVariant *platform_data; GVariant *platform_data;