From bec4e47d128ec40b58a2c9aae475f6a6fc4323c3 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 25 Jun 2007 10:51:42 +0930 Subject: [PATCH] NULL-terminate device list when synthesizing core devices. This fix is required for 93ca526892c0d22afa05cce6496198c652043a19 to work. --- hw/xfree86/common/xf86Config.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index 5ccc4512c..aedee4740 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -1339,7 +1339,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout) *devs[count - 1] = Pointer; devs[count - 1]->extraOptions = xf86addNewOption(NULL, xnfstrdup("CorePointer"), NULL); - devs[count]->identifier = NULL; + devs[count] = NULL; servlayoutp->inputs = devs; } } @@ -1379,7 +1379,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout) *devs[count - 1] = Pointer; devs[count - 1]->extraOptions = xf86addNewOption(NULL, xnfstrdup("AlwaysCore"), NULL); - devs[count]->identifier = NULL; + devs[count] = NULL; servlayoutp->inputs = devs; } } @@ -1475,7 +1475,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout) *devs[count - 1] = Keyboard; devs[count - 1]->extraOptions = xf86addNewOption(NULL, xnfstrdup("CoreKeyboard"), NULL); - devs[count]->identifier = NULL; + devs[count] = NULL; servlayoutp->inputs = devs; } }