diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2010-09-27 21:07:34 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2010-09-27 21:07:34 -0400 |
| commit | 47ba8cfcb857d62f15f4df58d5d5c7bd5088a107 (patch) | |
| tree | 8ac87ade34712565b87b3d12d57417d12c5b241f | |
| parent | 152e0aab5bb29d691e5e69e2f375b3b42e15e48e (diff) | |
| download | pango-47ba8cfcb857d62f15f4df58d5d5c7bd5088a107.tar.gz | |
Bug 628497 - Crash in pango_layout_line_get_extents at pango-layout.c
Cleanup LINE_IS_VALID() usage.
| -rw-r--r-- | pango/pango-layout.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/pango/pango-layout.c b/pango/pango-layout.c index c60c7e8f..4cf00a15 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -133,7 +133,7 @@ struct _PangoLayoutClass }; -#define LINE_IS_VALID(line) ((line)->layout != NULL) +#define LINE_IS_VALID(line) ((line) && (line)->layout != NULL) #ifdef G_DISABLE_CHECKS #define ITER_IS_INVALID(iter) FALSE @@ -3987,12 +3987,8 @@ pango_layout_line_x_to_index (PangoLayoutLine *line, gint last_trailing; gboolean suppress_last_trailing; - g_return_val_if_fail (line != NULL, FALSE); g_return_val_if_fail (LINE_IS_VALID (line), FALSE); - if (!LINE_IS_VALID (line)) - return FALSE; - layout = line->layout; /* Find the last index in the line @@ -4557,9 +4553,6 @@ pango_layout_line_get_extents (PangoLayoutLine *line, g_return_if_fail (LINE_IS_VALID (line)); - if (!LINE_IS_VALID (line)) - return; - if (G_UNLIKELY (!ink_rect && !logical_rect)) return; |