summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2013-02-11 15:27:26 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2013-09-30 11:16:39 +1000
commit5acc9884195ea4d0e39c5943a8ce29d88ba41971 (patch)
tree9405b627d5d113bf77f52a26aadeff9e9f74ae76
parent49a3dc18981dee5c67f5ff0514e226c2772493e7 (diff)
Don't de-reference pMse if it hasn't been initialised yet
If the device fails PreInit, UnInit is still called by pMse may be NULL. Dereferencing it is a bad idea. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/vmmouse.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/vmmouse.c b/src/vmmouse.c
index fb053c2..523f4fd 100644
--- a/src/vmmouse.c
+++ b/src/vmmouse.c
@@ -808,11 +808,13 @@ static void
VMMouseUnInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
{
MouseDevPtr pMse = pInfo->private;
- VMMousePrivPtr mPriv = (VMMousePrivPtr)pMse->mousePriv;
xf86Msg(X_INFO, "VMWARE(0): VMMouseUnInit\n");
- free(mPriv);
+ if (pMse) {
+ VMMousePrivPtr mPriv = (VMMousePrivPtr)pMse->mousePriv;
+ free(mPriv);
+ }
xf86DeleteInput(pInfo, flags);
}