← Back to branch summary

~ubuntu-branches/ubuntu/edgy/libxfont/edgy-updates

« back to all changes in this revision

Viewing changes to debian/patches/01_fontserver_fix_SEGV.diff

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Parra Novo
  • Date: 2006-07-19 16:05:02 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20060719160502-f769vluylmsem3vz
Tags: 1:1.2.0-0ubuntu1
* New Upstream version
* Dropped (empty) patch directory
* Re-Dropped libfontcache.so.0 from libxfont1.install

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01_fontserver_fix_SEGV.diff
1
 
Fix a SEGV in fs_read_list_info() to correctly handle a reply type of
2
 
FS_Error from fsListFontsWithXInfoReply().  This mirrors a similar check in
3
 
fs_read_open_font(), fs_read_query_info(), fs_read_extent_info(),
4
 
fs_read_glyphs(), and fs_read_list(), so why it was missing from this
5
 
function was a mystery.
6
 
 
7
 
This patch by Guillem Jover.  See Debian #294320.
8
 
 
9
 
Not submitted to X.Org yet.
10
 
 
11
 
Index: libXfont-X11R7.0-1.0.0/src/fc/fserve.c
12
 
===================================================================
13
 
--- libXfont-X11R7.0-1.0.0.orig/src/fc/fserve.c 2005-12-30 14:50:44.000000000 -0500
14
 
+++ libXfont-X11R7.0-1.0.0/src/fc/fserve.c      2006-02-26 18:34:58.000000000 -0500
15
 
@@ -2366,7 +2366,7 @@
16
 
     _fs_free_props (&binfo->info);
17
 
 
18
 
     rep = (fsListFontsWithXInfoReply *) fs_get_reply (conn, &ret);
19
 
-    if (rep == 0)
20
 
+    if (!rep || rep->type == FS_Error)
21
 
     {
22
 
        if (ret == FSIO_BLOCK)
23
 
            return StillWorking;