diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2023-04-07 12:01:22 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2023-04-07 12:01:22 +0000 |
| commit | a96df553e0667f07d02461c8b0e68f1743c9f8b8 (patch) | |
| tree | d05ef826de044d474f0f865ae45746069a6942bf | |
| parent | e0dbc6a0ee8c9e6abe1db14e74043f61005130d0 (diff) | |
| parent | ed8148bd076454d1f51adb7158547318195f4e0c (diff) | |
| download | gtk+-a96df553e0667f07d02461c8b0e68f1743c9f8b8.tar.gz | |
Merge branch '5729_fix_inspector_crash' into 'main'
inspector: fix crash caused by uninitialized GVariant
Closes #5729
See merge request GNOME/gtk!5799
| -rw-r--r-- | gtk/inspector/actions.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/gtk/inspector/actions.c b/gtk/inspector/actions.c index eeac0a188e..eb979bfd0c 100644 --- a/gtk/inspector/actions.c +++ b/gtk/inspector/actions.c @@ -172,10 +172,9 @@ bind_parameter_cb (GtkSignalListItemFactory *factory, name = action_holder_get_name (ACTION_HOLDER (item)); if (G_IS_ACTION_GROUP (owner)) parameter = (const char *)g_action_group_get_action_parameter_type (G_ACTION_GROUP (owner), name); - else if (GTK_IS_ACTION_MUXER (owner)) - gtk_action_muxer_query_action (GTK_ACTION_MUXER (owner), name, - NULL, (const GVariantType **)¶meter, NULL, NULL, NULL); - else + else if (!GTK_IS_ACTION_MUXER (owner) || + !gtk_action_muxer_query_action (GTK_ACTION_MUXER (owner), name, + NULL, (const GVariantType **)¶meter, NULL, NULL, NULL)) parameter = "(Unknown)"; gtk_label_set_label (GTK_LABEL (label), parameter); @@ -212,10 +211,9 @@ bind_state_cb (GtkSignalListItemFactory *factory, name = action_holder_get_name (ACTION_HOLDER (item)); if (G_IS_ACTION_GROUP (owner)) state = g_action_group_get_action_state (G_ACTION_GROUP (owner), name); - else if (GTK_IS_ACTION_MUXER (owner)) - gtk_action_muxer_query_action (GTK_ACTION_MUXER (owner), name, - NULL, NULL, NULL, NULL, &state); - else + else if (!GTK_IS_ACTION_MUXER (owner) || + !gtk_action_muxer_query_action (GTK_ACTION_MUXER (owner), name, + NULL, NULL, NULL, NULL, &state)) state = NULL; if (state) |