aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorMike DePaulo <mikedep333@gmail.com>2015-02-08 21:33:30 -0500
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-14 16:14:31 +0100
commita2c7cd9fef2d7d108e224ab47e77130dc98b249d (patch)
tree71f696c1239e282f22ce5ebbf935d5de7175daa1 /nx-X11
parent94c6de0649cd295044b1e4ff7265949c9c787519 (diff)
downloadnx-libs-a2c7cd9fef2d7d108e224ab47e77130dc98b249d.tar.gz
nx-libs-a2c7cd9fef2d7d108e224ab47e77130dc98b249d.tar.bz2
nx-libs-a2c7cd9fef2d7d108e224ab47e77130dc98b249d.zip
Don't crash when we receive an FS_Error from the font server (Guillem Jover). from xorg/lib/libXfont commit bfb8a71f4f7e5c5ed4278cb3ee271bf9990d276d
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/lib/font/fc/fserve.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/nx-X11/lib/font/fc/fserve.c b/nx-X11/lib/font/fc/fserve.c
index 0fdcc1d84..c159b2b46 100644
--- a/nx-X11/lib/font/fc/fserve.c
+++ b/nx-X11/lib/font/fc/fserve.c
@@ -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;