diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/fc/fserve.c | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2006-02-21 Daniel Stone <daniel@freedesktop.org> + + * src/fc/fserve.c: + Don't crash when we receive an FS_Error from the font server (Guillem + Jover). + 2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> * configure.ac: diff --git a/src/fc/fserve.c b/src/fc/fserve.c index dbb6f21..bce9241 100644 --- a/src/fc/fserve.c +++ b/src/fc/fserve.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/lib/font/fc/fserve.c,v 1.7 2005/07/08 19:53:05 ajax Exp $ */ +/* $XdotOrg: lib/Xfont/src/fc/fserve.c,v 1.8 2005/07/09 06:36:12 keithp Exp $ */ /* $Xorg: fserve.c,v 1.4 2001/02/09 02:04:02 xorgcvs Exp $ */ /* @@ -2366,7 +2366,7 @@ fs_read_list_info(FontPathElementPtr fpe, FSBlockDataPtr blockrec) _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; |