From 7e9e01a4a34fa45521067d43c5bbff942dd5d51a Mon Sep 17 00:00:00 2001 From: Eamon Walsh Date: Wed, 10 Oct 2007 17:40:22 -0400 Subject: [PATCH] dix: pass a valid ClientPtr to SetFontPath in all cases. --- dix/main.c | 6 +++--- hw/dmx/dmxfont.c | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dix/main.c b/dix/main.c index 03e0013e8..119828bd7 100644 --- a/dix/main.c +++ b/dix/main.c @@ -388,9 +388,9 @@ main(int argc, char *argv[], char *envp[]) FatalError("failed to initialize core devices"); InitFonts(); - if (loadableFonts) { - SetFontPath(0, 0, (unsigned char *)defaultFontPath, &error); - } + if (loadableFonts) + SetFontPath(serverClient, 0, (unsigned char *)defaultFontPath, + &error); else { if (SetDefaultFontPath(defaultFontPath) != Success) ErrorF("failed to set default font path '%s'", diff --git a/hw/dmx/dmxfont.c b/hw/dmx/dmxfont.c index e5f86350a..b70f7d2df 100644 --- a/hw/dmx/dmxfont.c +++ b/hw/dmx/dmxfont.c @@ -361,7 +361,8 @@ Bool dmxBELoadFont(ScreenPtr pScreen, FontPtr pFont) } } - if (SetFontPath(NULL, newnpaths, (unsigned char *)newfp, &error)) { + if (SetFontPath(serverClient, newnpaths, (unsigned char *)newfp, + &error)) { /* Note that this should never happen since all of the * FPEs were previously valid. */ dmxLog(dmxError, "Cannot reset the default font path.\n");