Author: dnusinow Date: 2006-02-26 18:36:12 -0500 (Sun, 26 Feb 2006) New Revision: 1329
Added: branches/modular/lib/libXfont-X11R7.0-1.0.0/debian/patches/ branches/modular/lib/libXfont-X11R7.0-1.0.0/debian/patches/01_fontserver_fix_SEGV.diff branches/modular/lib/libXfont-X11R7.0-1.0.0/debian/patches/series Modified: branches/modular/lib/libXfont-X11R7.0-1.0.0/debian/changelog branches/modular/lib/libXfont-X11R7.0-1.0.0/debian/rules Log: * Port patches from trunk + general/099v_fontserver_fix_SEGV.diff Modified: branches/modular/lib/libXfont-X11R7.0-1.0.0/debian/changelog =================================================================== --- branches/modular/lib/libXfont-X11R7.0-1.0.0/debian/changelog 2006-02-26 23:30:18 UTC (rev 1328) +++ branches/modular/lib/libXfont-X11R7.0-1.0.0/debian/changelog 2006-02-26 23:36:12 UTC (rev 1329) @@ -2,8 +2,10 @@ * Have libxfont-dev depend on libfreetype6-dev and libfontenc-dev. Thanks Eugene Konev. + * Port patches from trunk + + general/099v_fontserver_fix_SEGV.diff - -- David Nusinow <[EMAIL PROTECTED]> Sun, 19 Feb 2006 10:08:50 -0500 + -- David Nusinow <[EMAIL PROTECTED]> Sun, 26 Feb 2006 18:35:44 -0500 libxfont (1:1.0.0-1) experimental; urgency=low Added: branches/modular/lib/libXfont-X11R7.0-1.0.0/debian/patches/01_fontserver_fix_SEGV.diff =================================================================== --- branches/modular/lib/libXfont-X11R7.0-1.0.0/debian/patches/01_fontserver_fix_SEGV.diff 2006-02-26 23:30:18 UTC (rev 1328) +++ branches/modular/lib/libXfont-X11R7.0-1.0.0/debian/patches/01_fontserver_fix_SEGV.diff 2006-02-26 23:36:12 UTC (rev 1329) @@ -0,0 +1,23 @@ +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 X.Org yet. + +Index: libXfont-X11R7.0-1.0.0/src/fc/fserve.c +=================================================================== +--- libXfont-X11R7.0-1.0.0.orig/src/fc/fserve.c 2005-12-30 14:50:44.000000000 -0500 ++++ libXfont-X11R7.0-1.0.0/src/fc/fserve.c 2006-02-26 18:34:58.000000000 -0500 +@@ -2366,7 +2366,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; Added: branches/modular/lib/libXfont-X11R7.0-1.0.0/debian/patches/series =================================================================== --- branches/modular/lib/libXfont-X11R7.0-1.0.0/debian/patches/series 2006-02-26 23:30:18 UTC (rev 1328) +++ branches/modular/lib/libXfont-X11R7.0-1.0.0/debian/patches/series 2006-02-26 23:36:12 UTC (rev 1329) @@ -0,0 +1 @@ +01_fontserver_fix_SEGV.diff Modified: branches/modular/lib/libXfont-X11R7.0-1.0.0/debian/rules =================================================================== --- branches/modular/lib/libXfont-X11R7.0-1.0.0/debian/rules 2006-02-26 23:30:18 UTC (rev 1328) +++ branches/modular/lib/libXfont-X11R7.0-1.0.0/debian/rules 2006-02-26 23:36:12 UTC (rev 1329) @@ -32,7 +32,7 @@ confflags += --enable-fc -build: build-stamp +build: patch build-stamp build-stamp: dh_testdir @@ -45,7 +45,7 @@ touch build-stamp -clean: +clean: xsfclean dh_testdir dh_testroot rm -f build-stamp -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]