diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2016-01-29 23:36:24 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2016-01-30 00:29:04 -0500 |
| commit | e54549502e3b0b1bd8b01fc7de9c44a339e4437c (patch) | |
| tree | ee2ef5a6e7b636292e95c6db0ae893df35c6d20c /gtk/gtkicontheme.c | |
| parent | 2e4b1e72f4a272c426a12135f3487aa2017c746a (diff) | |
| download | gtk+-e54549502e3b0b1bd8b01fc7de9c44a339e4437c.tar.gz | |
icontheme: Avoid a crash
gtk_icon_info_new_for_file with a size of 0 would fail for
symbolic pngs because we ended up scaling with 0. Avoid this.
Diffstat (limited to 'gtk/gtkicontheme.c')
| -rw-r--r-- | gtk/gtkicontheme.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index 0a0425829b..d7dc37154d 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -3949,7 +3949,7 @@ icon_info_ensure_scale_and_pixbuf (GtkIconInfo *icon_info) icon_info->scale = image_size / 1000.; else if (icon_info->scale < 0.0) { - if (image_size > 0) + if (image_size > 0 && scaled_desired_size > 0) icon_info->scale = (gdouble)scaled_desired_size / (gdouble)image_size; else icon_info->scale = 1.0; |