diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2006-04-10 10:33:17 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2006-04-10 10:33:17 +0000 |
| commit | c1dcd7c62cd0842f8c71668b955cde3a63ca5d57 (patch) | |
| tree | b8788ca24551665a5f9fa38877a041463f7f2cc7 /pango/pangox.c | |
| parent | 2dc25756424f9ba88b7214cd60a949a0c88b4af6 (diff) | |
| download | pango-c1dcd7c62cd0842f8c71668b955cde3a63ca5d57.tar.gz | |
Fix minor bugs reported by the Coverity scan report.
2006-04-10 Behdad Esfahbod <behdad@gnome.org>
Fix minor bugs reported by the Coverity scan report.
* pango/opentype/harfbuzz-gdef.c (HB_GDEF_Build_ClassDefinition):
* pango/opentype/harfbuzz-gpos.c (HB_GPOS_Query_Scripts),
(HB_GPOS_Query_Languages), (HB_GPOS_Query_Features): Do not access
structs before we check them for nullity.
* pango/pango-layout.c (pango_layout_index_to_line),
(pango_layout_index_to_line_and_extents),
(pango_layout_index_to_pos): Check for invalid iterators outside the
loop, so we don't crash.
* pango/pango-layout.c (pango_layout_line_x_to_index): Set
char_trailing instead of trailing in one of too many paths. Should
have been a typo.
* pango/pangox.c (get_font_metrics_from_subfonts): Check for nullity
somewhere.
Diffstat (limited to 'pango/pangox.c')
| -rw-r--r-- | pango/pangox.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pango/pangox.c b/pango/pangox.c index 841c51e3..62af25c6 100644 --- a/pango/pangox.c +++ b/pango/pangox.c @@ -830,7 +830,7 @@ get_font_metrics_from_subfonts (PangoFont *font, } } - if (get_int_prop (avg_width_atom, fs, &avg_width)) + if (fs && get_int_prop (avg_width_atom, fs, &avg_width)) { /* convert decipoints --> Pango units. * Resolution is in (points * PANGO_SCALE) / pixel, |