Merge branch 'scale-button-empty-icon-list' into 'main'

Don't crash when updating the icon on a `GtkScaleButton` with a non-`NULL` empty icon list

See merge request GNOME/gtk!4475
This commit is contained in:
Matthias Clasen
2022-02-22 19:39:32 +00:00

View File

@@ -884,7 +884,7 @@ gtk_scale_button_update_icon (GtkScaleButton *button)
const char *name;
guint num_icons;
if (!priv->icon_list || priv->icon_list[0][0] == '\0')
if (!priv->icon_list || !priv->icon_list[0] || priv->icon_list[0][0] == '\0')
{
gtk_button_set_icon_name (GTK_BUTTON (priv->button), "image-missing");
return;