frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Daniel Stone 2006-10-23 02:57:00 +03:00 committed by Daniel Stone
parent 523fe64ba1
commit fab1d37ecb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xfree86/common/xf86Option.c
View File

@ -142,14 +142,14 @@ xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts,
if (defaultOpts) { if (defaultOpts) {
pInfo->options = xf86OptionListCreate(defaultOpts, -1, 0); 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); tmp = xf86optionListDup(pInfo->conf_idev->commonOptions);
if (pInfo->options) if (pInfo->options)
pInfo->options = xf86optionListMerge(pInfo->options, tmp); pInfo->options = xf86optionListMerge(pInfo->options, tmp);
else else
pInfo->options = tmp; pInfo->options = tmp;
} }
if (pInfo->conf_idev->extraOptions) { if (pInfo->conf_idev && pInfo->conf_idev->extraOptions) {
tmp = xf86optionListDup(pInfo->conf_idev->extraOptions); tmp = xf86optionListDup(pInfo->conf_idev->extraOptions);
if (pInfo->options) if (pInfo->options)
pInfo->options = xf86optionListMerge(pInfo->options, tmp); pInfo->options = xf86optionListMerge(pInfo->options, tmp);