diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-01-29 10:24:32 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2013-02-08 13:47:23 +1000 |
| commit | 48bc30c5413a1be0039fa77affcbbb4fe677479f (patch) | |
| tree | b082cbeb700f41089213ced74b31114ef9e0f81d /Xext/xtest.c | |
| parent | 1058fcf57fdcb94d92e7b5f4483b347853d5f8e6 (diff) | |
Xext: avoid null-pointer dereference in XTestFakeInput (#59937)
dv is still NULL at this point, so return firstValuator instead (which is
the same value dv->firstValuator would be once initialized)
X.Org Bug 59937 <http://bugs.freedesktop.org/show_bug.cgi?id=59937>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'Xext/xtest.c')
| -rw-r--r-- | Xext/xtest.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Xext/xtest.c b/Xext/xtest.c index 2abdc7f58..6519b9c82 100644 --- a/Xext/xtest.c +++ b/Xext/xtest.c @@ -156,7 +156,6 @@ ProcXTestFakeInput(ClientPtr client) DeviceIntPtr dev = NULL; WindowPtr root; Bool extension = FALSE; - deviceValuator *dv = NULL; ValuatorMask mask; int valuators[MAX_VALUATORS] = { 0 }; int numValuators = 0; @@ -241,14 +240,14 @@ ProcXTestFakeInput(ClientPtr client) } if (nev > 1 && !dev->valuator) { - client->errorValue = dv->first_valuator; + client->errorValue = firstValuator; return BadValue; } /* check validity of valuator events */ base = firstValuator; for (n = 1; n < nev; n++) { - dv = (deviceValuator *) (ev + n); + deviceValuator *dv = (deviceValuator *) (ev + n); if (dv->type != DeviceValuator) { client->errorValue = dv->type; return BadValue; |