X Strike Force XFree86 SVN commit: r2181 - in trunk/debian: . patches
Author: branden
Date: 2005-02-09 04:04:58 -0500 (Wed, 09 Feb 2005)
New Revision: 2181
Added:
trunk/debian/patches/099v_fontserver_fix_SEGV.diff
Modified:
trunk/debian/CHANGESETS
trunk/debian/TODO
trunk/debian/changelog
Log:
Add patch #099v by Guillem Jover to fix a SEGV in font server code
shared between xfs and the X server. Thanks, Guillem! (Closes: #294320)
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2005-02-09 08:57:36 UTC (rev 2180)
+++ trunk/debian/CHANGESETS 2005-02-09 09:04:58 UTC (rev 2181)
@@ -297,4 +297,8 @@
Piotr Kaczuba for this information. (Closes: #277699 (again))
2178, 2180
+Add patch #099v by Guillem Jover to fix a SEGV in font server code
+shared between xfs and the X server. Thanks, Guillem! (Closes: #294320)
+ 2181
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2005-02-09 08:57:36 UTC (rev 2180)
+++ trunk/debian/TODO 2005-02-09 09:04:58 UTC (rev 2181)
@@ -22,8 +22,6 @@
/usr/share/bug/$PACKAGE/script (renaming in SVN from $PACKAGE.bug to
$PACKAGE.bug.script).
+ Add $PACKAGE.bug.presubj files wherever necessary.
-* Fix SEGV in shared xfs/X server font code with patch from Guillem Jover.
- See #294320.
4.3.0.dfsg.1-12
---------------
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-02-09 08:57:36 UTC (rev 2180)
+++ trunk/debian/changelog 2005-02-09 09:04:58 UTC (rev 2181)
@@ -232,8 +232,11 @@
SEGVs in the X server's ELF object loader on AMD64 systems. Thanks to
Piotr Kaczuba for this information. (Closes: #277699 (again))
- -- Branden Robinson <branden@debian.org> Wed, 9 Feb 2005 02:37:27 -0500
+ * Add patch #099v by Guillem Jover to fix a SEGV in font server code
+ shared between xfs and the X server. Thanks, Guillem! (Closes: #294320)
+ -- Branden Robinson <branden@debian.org> Wed, 9 Feb 2005 04:00:07 -0500
+
xfree86 (4.3.0.dfsg.1-10) unstable; urgency=medium
* Upload urgency set to medium due to fix for stable-release-critical bugs
Added: trunk/debian/patches/099v_fontserver_fix_SEGV.diff
===================================================================
--- trunk/debian/patches/099v_fontserver_fix_SEGV.diff 2005-02-09 08:57:36 UTC (rev 2180)
+++ trunk/debian/patches/099v_fontserver_fix_SEGV.diff 2005-02-09 09:04:58 UTC (rev 2181)
@@ -0,0 +1,23 @@
+$Id$
+
+Fix a SEGV in fs_read_list_info() to correctly handle a reply type of
+FS_Error from fsListFontsWithXInfoReply(). This mirrors a similar check in
+fs_read_open_font(), fs_read_query_info(), fs_read_extent_info(),
+fs_read_glyphs(), and fs_read_list(), so why it was missing from this
+function was a mystery.
+
+This patch by Guillem Jover. See Debian #294320.
+
+Not submitted to XFree86 or X.Org yet.
+
+--- xc/lib/font/fc/fserve.c~ 2005-02-09 03:27:04.000000000 -0500
++++ xc/lib/font/fc/fserve.c 2005-02-09 03:27:48.000000000 -0500
+@@ -2332,7 +2332,7 @@
+ _fs_free_props (&binfo->info);
+
+ rep = (fsListFontsWithXInfoReply *) fs_get_reply (conn, &ret);
+- if (rep == 0)
++ if (!rep || rep->type == FS_Error)
+ {
+ if (ret == FSIO_BLOCK)
+ return StillWorking;
Property changes on: trunk/debian/patches/099v_fontserver_fix_SEGV.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Reply to: