summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2004-11-20 21:03:51 +0000
committerOwen Taylor <otaylor@src.gnome.org>2004-11-20 21:03:51 +0000
commitf6d966476dfe3a3fcd44941cd698b8153460a9ca (patch)
tree5a10256f7a681adb7bb66bd3984dabc90ee2a914
parent25eb23b0c27d6c447240fcf8505ad35a2a5a5d93 (diff)
downloadpango-f6d966476dfe3a3fcd44941cd698b8153460a9ca.tar.gz
Fix crash when renderer->matrix is NULL.
Fri Nov 19 18:45:24 2004 Owen Taylor <otaylor@redhat.com> * pango/pango-renderer.c (pango_renderer_default_draw_error_underline): Fix crash when renderer->matrix is NULL.
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-1-105
-rw-r--r--ChangeLog.pre-1-85
-rw-r--r--pango/pango-renderer.c2
4 files changed, 16 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d84c2cc7..4975edd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov 19 18:45:24 2004 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-renderer.c (pango_renderer_default_draw_error_underline):
+ Fix crash when renderer->matrix is NULL.
+
Fri Nov 19 17:44:33 2004 Owen Taylor <otaylor@redhat.com>
* pango/pango-renderer.[ch]: Remove color_set() virtual
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index d84c2cc7..4975edd4 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,8 @@
+Fri Nov 19 18:45:24 2004 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-renderer.c (pango_renderer_default_draw_error_underline):
+ Fix crash when renderer->matrix is NULL.
+
Fri Nov 19 17:44:33 2004 Owen Taylor <otaylor@redhat.com>
* pango/pango-renderer.[ch]: Remove color_set() virtual
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index d84c2cc7..4975edd4 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,8 @@
+Fri Nov 19 18:45:24 2004 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-renderer.c (pango_renderer_default_draw_error_underline):
+ Fix crash when renderer->matrix is NULL.
+
Fri Nov 19 17:44:33 2004 Owen Taylor <otaylor@redhat.com>
* pango/pango-renderer.[ch]: Remove color_set() virtual
diff --git a/pango/pango-renderer.c b/pango/pango-renderer.c
index cbdadb46..bc2d462c 100644
--- a/pango/pango-renderer.c
+++ b/pango/pango-renderer.c
@@ -887,7 +887,7 @@ pango_renderer_default_draw_error_underline (PangoRenderer *renderer,
while (TRUE)
{
PangoMatrix total;
- get_total_matrix (&total, renderer->matrix, x, y, square);
+ get_total_matrix (&total, matrix, x, y, square);
draw_rectangle (renderer, &total, PANGO_RENDER_PART_UNDERLINE, /* A */
0, 0,