Bug 438814 – synaptic crash with pango 1.17.0

2007-05-16  Behdad Esfahbod  <behdad@gnome.org>

        Bug 438814 – synaptic crash with pango 1.17.0

        * pango/pango-layout.c (process_item): Make sure we find some break
        point even if overflowing the line.

svn path=/trunk/; revision=2311

diff --git a/ChangeLog b/ChangeLog
index 6d2b094..7a4a6e1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-05-16  Behdad Esfahbod  <behdad@gnome.org>
+
+       Bug 438814 – synaptic crash with pango 1.17.0
+
+       * pango/pango-layout.c (process_item): Make sure we find some break
+       point even if overflowing the line.
+
 2007-05-15  Behdad Esfahbod  <behdad@gnome.org>
 
        * modules/hebrew/hebrew-fc.c (hebrew_engine_shape):

diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index 23378b9..df2b769 100644 (file)
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -3224,7 +3224,7 @@ process_item (PangoLayout     *layout,
       width = 0;
       for (num_chars = 0; num_chars < item->num_chars; num_chars++)
        {
-         if (width > state->remaining_width)
+         if (width > state->remaining_width && break_num_chars < item->num_chars)
            break;
 
          /* If there are no previous runs we have to take care to grab at least one char. */