diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-11-06 09:49:23 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-11-06 09:49:23 +1000 |
| commit | ae6fa7e8da68e2e487da5ad84f9d924204a5e1d4 (patch) | |
| tree | 0148561cb5bbc0f58c872c283e9bf69bea7fb331 /src/wcmConfig.c | |
| parent | 613d455c118b92ba784aff007df57bd6bac92196 (diff) | |
| download | xf86-input-wacom-ae6fa7e8da68e2e487da5ad84f9d924204a5e1d4.tar.gz | |
Don't accept invalid Rotate and ForceDevice options.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src/wcmConfig.c')
| -rwxr-xr-x | src/wcmConfig.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/src/wcmConfig.c b/src/wcmConfig.c index 2d246e5..293b2e3 100755 --- a/src/wcmConfig.c +++ b/src/wcmConfig.c @@ -923,11 +923,19 @@ static LocalDevicePtr xf86WcmInit(InputDriverPtr drv, IDevPtr dev, int flags) /* ISDV4 support */ s = xf86SetStrOption(local->options, "ForceDevice", NULL); - if (s && (xf86NameCmp(s, "ISDV4") == 0)) + if (s) { - common->wcmForceDevice=DEVICE_ISDV4; - common->wcmDevCls = &gWacomISDV4Device; - common->wcmTPCButtonDefault = 1; /* Tablet PC buttons on by default */ + if (xf86NameCmp(s, "ISDV4") == 0) + { + common->wcmForceDevice=DEVICE_ISDV4; + common->wcmDevCls = &gWacomISDV4Device; + common->wcmTPCButtonDefault = 1; /* Tablet PC buttons on by default */ + } else + { + xf86Msg(X_ERROR, "%s: invalid ForceDevice option '%s'.\n", + local->name, s); + goto SetupProc_fail; + } } s = xf86SetStrOption(local->options, "Rotate", NULL); @@ -940,6 +948,12 @@ static LocalDevicePtr xf86WcmInit(InputDriverPtr drv, IDevPtr dev, int flags) common->wcmRotate=ROTATE_CCW; else if (xf86NameCmp(s, "HALF") ==0) common->wcmRotate=ROTATE_HALF; + else if (xf86NameCmp(s, "NONE") !=0) + { + xf86Msg(X_ERROR, "%s: invalid Rotate option '%s'.\n", + local->name, s); + goto SetupProc_fail; + } } common->wcmSuppress = xf86SetIntOption(local->options, "Suppress", |