r19427 - in /desktop/unstable/pango1.0/debian: changelog patches/14_gnome-panel-crash.patch patches/series

slomo at users.alioth.debian.org slomo at users.alioth.debian.org
Wed Apr 8 06:49:04 UTC 2009


Author: slomo
Date: Wed Apr  8 06:49:02 2009
New Revision: 19427

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19427
Log:
* debian/patches/14_gnome-panel-crash.patch:
  + Fix a crash in gnome-panel that happend because of invalid
    memory accesses in pango. Patch from upstream GIT.

Added:
    desktop/unstable/pango1.0/debian/patches/14_gnome-panel-crash.patch
Modified:
    desktop/unstable/pango1.0/debian/changelog
    desktop/unstable/pango1.0/debian/patches/series

Modified: desktop/unstable/pango1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/changelog?rev=19427&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/changelog (original)
+++ desktop/unstable/pango1.0/debian/changelog Wed Apr  8 06:49:02 2009
@@ -1,3 +1,11 @@
+pango1.0 (1.24.0-3) unstable; urgency=low
+
+  * debian/patches/14_gnome-panel-crash.patch:
+    + Fix a crash in gnome-panel that happend because of invalid
+      memory accesses in pango. Patch from upstream GIT.
+
+ -- Sebastian Dröge <slomo at debian.org>  Wed, 08 Apr 2009 08:47:32 +0200
+
 pango1.0 (1.24.0-2) unstable; urgency=low
 
   * Upload to unstable, this won't break any transitions because of the

Added: desktop/unstable/pango1.0/debian/patches/14_gnome-panel-crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/patches/14_gnome-panel-crash.patch?rev=19427&op=file
==============================================================================
--- desktop/unstable/pango1.0/debian/patches/14_gnome-panel-crash.patch (added)
+++ desktop/unstable/pango1.0/debian/patches/14_gnome-panel-crash.patch Wed Apr  8 06:49:02 2009
@@ -1,0 +1,56 @@
+From dd6ce709db5872132335fef9f75aa16a33d6e5aa Mon Sep 17 00:00:00 2001
+From: Behdad Esfahbod <behdad at behdad.org>
+Date: Mon, 06 Apr 2009 23:49:02 +0000
+Subject: [layout] Truncate final whitespace in the line before ellipsizing
+
+Bug 556132 – gnome-panel crashed with SIGSEGV in
+g_cclosure_marshal_VOID__BOXED()
+
+Not after.  Also fixes invalid memory access in case line was both
+wrapped and ellipsized.
+---
+diff --git a/pango/pango-layout.c b/pango/pango-layout.c
+index b1b75a4..4326eb4 100644
+--- a/pango/pango-layout.c
++++ b/pango/pango-layout.c
+@@ -5166,18 +5166,21 @@ pango_layout_line_postprocess (PangoLayoutLine *line,
+ 			       ParaBreakState  *state,
+ 			       gboolean         wrapped)
+ {
+-  PangoLayoutRun *last_run = line->runs->data;
+   gboolean ellipsized = FALSE;
+   
+-  /* NB: the runs are in reverse order at this point, since we prepended them to the list
++  DEBUG ("postprocessing", line, state);
++
++  /* Truncate the logical-final whitespace in the line if we broke the line at it
+    */
++  if (wrapped)
++    /* The runs are in reverse order at this point, since we prepended them to the list.
++     * So, the first run is the last logical run. */
++    zero_line_final_space (line, state, line->runs->data);
+ 
+   /* Reverse the runs
+    */
+   line->runs = g_slist_reverse (line->runs);
+ 
+-  DEBUG ("postprocessing", line, state);
+-
+   /* Ellipsize the line if necessary
+    */
+   if (G_UNLIKELY (state->line_width >= 0 &&
+@@ -5186,11 +5189,6 @@ pango_layout_line_postprocess (PangoLayoutLine *line,
+       ellipsized = _pango_layout_line_ellipsize (line, state->attrs, state->line_width);
+     }
+ 
+-  /* Truncate the logical-final whitespace in the line if we broke the line at it
+-   */
+-  if (wrapped)
+-    zero_line_final_space (line, state, last_run);
+-
+   DEBUG ("after removing final space", line, state);
+ 
+   /* Now convert logical to visual order
+--
+cgit v0.8.2
+

Modified: desktop/unstable/pango1.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/patches/series?rev=19427&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/patches/series (original)
+++ desktop/unstable/pango1.0/debian/patches/series Wed Apr  8 06:49:02 2009
@@ -2,4 +2,5 @@
 11_module-files-append-module-files-d.patch
 12_module-files-append-compat-module-files-d.patch
 13_pango-view-undefined-references.patch
+14_gnome-panel-crash.patch
 90_relibtoolize.patch




More information about the pkg-gnome-commits mailing list