← Back to branch summary

~ubuntu-branches/ubuntu/vivid/pango1.0/vivid-proposed

« back to all changes in this revision

Viewing changes to pango/pango-layout.c

  • Committer: Bazaar Package Importer
  • Author(s): Josselin Mouette
  • Date: 2010-10-19 23:37:45 UTC
  • mfrom: (1.5.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20101019233745-xey8xlf91rpkth51
Tags: 1.28.3-1
http://bugs.debian.org/598166
* New upstream stable release.
  + Fixes SIGFPE in opentype renderer. Closes: #598166.

Show diffs side-by-side

added added

removed removed

Lines of Context:
pango/pango-layout.c
133
133
 
134
134
};
135
135
 
136
 
#define LINE_IS_VALID(line) ((line)->layout != NULL)
 
136
#define LINE_IS_VALID(line) ((line) && (line)->layout != NULL)
137
137
 
138
138
#ifdef G_DISABLE_CHECKS
139
139
#define ITER_IS_INVALID(iter) FALSE
3987
3987
  gint last_trailing;
3988
3988
  gboolean suppress_last_trailing;
3989
3989
 
3990
 
  g_return_val_if_fail (line != NULL, FALSE);
3991
3990
  g_return_val_if_fail (LINE_IS_VALID (line), FALSE);
3992
3991
 
3993
 
  if (!LINE_IS_VALID (line))
3994
 
    return FALSE;
3995
 
 
3996
3992
  layout = line->layout;
3997
3993
 
3998
3994
  /* Find the last index in the line
4557
4553
 
4558
4554
  g_return_if_fail (LINE_IS_VALID (line));
4559
4555
 
4560
 
  if (!LINE_IS_VALID (line))
4561
 
    return;
4562
 
 
4563
4556
  if (G_UNLIKELY (!ink_rect && !logical_rect))
4564
4557
    return;
4565
4558