From fab1d37ecbeee9777ad1485b0cc62b55042d5014 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Mon, 23 Oct 2006 02:57:00 +0300 Subject: [PATCH] xfree86/options: don't blindly dereference NULL pointers Sure, conf_idev should be initialised, but if it's not, try to make the best of a bad situation. --- hw/xfree86/common/xf86Option.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/xfree86/common/xf86Option.c b/hw/xfree86/common/xf86Option.c index 0a4c11d8d..7afb63a4d 100644 --- a/hw/xfree86/common/xf86Option.c +++ b/hw/xfree86/common/xf86Option.c @@ -142,14 +142,14 @@ xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts, if (defaultOpts) { pInfo->options = xf86OptionListCreate(defaultOpts, -1, 0); } - if (pInfo->conf_idev->commonOptions) { + if (pInfo->conf_idev && pInfo->conf_idev->commonOptions) { tmp = xf86optionListDup(pInfo->conf_idev->commonOptions); if (pInfo->options) pInfo->options = xf86optionListMerge(pInfo->options, tmp); else pInfo->options = tmp; } - if (pInfo->conf_idev->extraOptions) { + if (pInfo->conf_idev && pInfo->conf_idev->extraOptions) { tmp = xf86optionListDup(pInfo->conf_idev->extraOptions); if (pInfo->options) pInfo->options = xf86optionListMerge(pInfo->options, tmp);