diff options
| author | Owen Taylor <otaylor@redhat.com> | 1999-02-25 05:52:00 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 1999-02-25 05:52:00 +0000 |
| commit | b515672a1e4b68fa36e93e62e5e6ba5a90ef8a86 (patch) | |
| tree | 66647f20082151daee1c25f9d6a9fb0b245d9402 /gtk/gtkfontsel.c | |
| parent | b1135416f2b51afe668db6b6b3a7887151d80ee8 (diff) | |
| download | gtk+-b515672a1e4b68fa36e93e62e5e6ba5a90ef8a86.tar.gz | |
Don't access *bitmapped_sizes if nbitmapped_sizes == 0. (Pointed out by
Thu Feb 25 00:48:51 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfontsel.c: Don't access *bitmapped_sizes
if nbitmapped_sizes == 0. (Pointed out by
zucchi@zedzone.fsi.com.au (Michael Zucchi))
Diffstat (limited to 'gtk/gtkfontsel.c')
| -rw-r--r-- | gtk/gtkfontsel.c | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c index 537af39f86..060d56ed22 100644 --- a/gtk/gtkfontsel.c +++ b/gtk/gtkfontsel.c @@ -1391,10 +1391,11 @@ gtk_font_selection_show_available_sizes (GtkFontSelection *fontsel) FontInfo *font; FontStyle *styles, *style; const guint16 *standard_sizes; - guint16 *bitmapped_sizes, bitmap_size; + guint16 *bitmapped_sizes; gint nstandard_sizes, nbitmapped_sizes; gchar buffer[16], *size; - gfloat bitmap_size_float; + gfloat bitmap_size_float = 0.; + guint16 bitmap_size = 0; gboolean can_match; gint type_filter; @@ -1437,18 +1438,20 @@ gtk_font_selection_show_available_sizes (GtkFontSelection *fontsel) while (nstandard_sizes || nbitmapped_sizes) { can_match = TRUE; - if (fontsel->metric == GTK_FONT_METRIC_POINTS) - { - if (*bitmapped_sizes % 10 != 0) - can_match = FALSE; - bitmap_size = *bitmapped_sizes / 10; - bitmap_size_float = *bitmapped_sizes / 10; - } - else - { - bitmap_size = *bitmapped_sizes; - bitmap_size_float = *bitmapped_sizes; - } + + if (nbitmapped_sizes) + if (fontsel->metric == GTK_FONT_METRIC_POINTS) + { + if (*bitmapped_sizes % 10 != 0) + can_match = FALSE; + bitmap_size = *bitmapped_sizes / 10; + bitmap_size_float = *bitmapped_sizes / 10; + } + else + { + bitmap_size = *bitmapped_sizes; + bitmap_size_float = *bitmapped_sizes; + } if (can_match && nstandard_sizes && nbitmapped_sizes && *standard_sizes == bitmap_size) |