From 441246c5c5b5632abd44a13823e5171c915c67df Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sat, 11 Feb 2006 20:34:14 +0000 Subject: =?UTF-8?q?Bug=20330795=20=E2=80=93=20pango=5Frenderer=5Fdraw=5Fgl?= =?UTF-8?q?yph=20segfaults=20when=20trying=20to=20call=20the?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2006-02-11 Behdad Esfahbod Bug 330795 – pango_renderer_draw_glyph segfaults when trying to call the class vfunc Opened by Torsten Schoenfeld * pango/pango-renderer.c (pango_renderer_draw_trapezoid, pango_renderer_draw_glyph): Bail if method is not implemented. --- ChangeLog | 9 +++++++++ pango/pango-renderer.c | 10 ++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9e4b6f60..bf67dfa6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-02-11 Behdad Esfahbod + + Bug 330795 – pango_renderer_draw_glyph segfaults when trying to call + the class vfunc + Opened by Torsten Schoenfeld + + * pango/pango-renderer.c (pango_renderer_draw_trapezoid, + pango_renderer_draw_glyph): Bail if method is not implemented. + 2006-02-11 Behdad Esfahbod * === Released 1.11.5 === diff --git a/pango/pango-renderer.c b/pango/pango-renderer.c index 67bef8cf..cdb876f7 100644 --- a/pango/pango-renderer.c +++ b/pango/pango-renderer.c @@ -938,9 +938,10 @@ pango_renderer_draw_trapezoid (PangoRenderer *renderer, g_return_if_fail (PANGO_IS_RENDERER (renderer)); g_return_if_fail (renderer->active_count > 0); - PANGO_RENDERER_GET_CLASS (renderer)->draw_trapezoid (renderer, part, - y1_, x11, x21, - y2, x12, x22); + if (PANGO_RENDERER_GET_CLASS (renderer)->draw_trapezoid) + PANGO_RENDERER_GET_CLASS (renderer)->draw_trapezoid (renderer, part, + y1_, x11, x21, + y2, x12, x22); } /** @@ -968,7 +969,8 @@ pango_renderer_draw_glyph (PangoRenderer *renderer, if (glyph == PANGO_GLYPH_EMPTY) /* glyph PANGO_GLYPH_EMPTY never renders */ return; - PANGO_RENDERER_GET_CLASS (renderer)->draw_glyph (renderer, font, glyph, x, y); + if (PANGO_RENDERER_GET_CLASS (renderer)->draw_glyph) + PANGO_RENDERER_GET_CLASS (renderer)->draw_glyph (renderer, font, glyph, x, y); } /** -- cgit v1.2.1