From 8d6249b2c1200dfaf3e98c40e82ab2796e9ef28c Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sun, 13 Jan 2008 11:40:53 +0000 Subject: [PATCH] [cairo-scaled-font] Add missing matrix guard to cairo_scaled_font_create(). cairo_scaled_font_create() did not check the user supplied ctm was valid, triggering an assertion later when computing the scale factors. --- src/cairo-scaled-font.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/cairo-scaled-font.c b/src/cairo-scaled-font.c index 1ad10b9ac..03d813836 100644 --- a/src/cairo-scaled-font.c +++ b/src/cairo-scaled-font.c @@ -608,6 +608,9 @@ cairo_scaled_font_create (cairo_font_face_t *font_face, if (! _cairo_matrix_is_invertible (font_matrix)) return (cairo_scaled_font_t *)&_cairo_scaled_font_nil; + if (! _cairo_matrix_is_invertible (ctm)) + return (cairo_scaled_font_t *)&_cairo_scaled_font_nil; + font_map = _cairo_scaled_font_map_lock (); if (font_map == NULL) return (cairo_scaled_font_t *)&_cairo_scaled_font_nil;