File U_Don-t-de-reference-pMse-if-it-hasn-t-been-ini... of Package xf86-input-vmmouse

Overview Repositories Revisions Requests Users Attributes Meta

File U_Don-t-de-reference-pMse-if-it-hasn-t-been-initialise.patch of Package xf86-input-vmmouse (Revision 1722d00322e9cf1d37c904df36fe071d)

Currently displaying revision 1722d00322e9cf1d37c904df36fe071d , Show latest

From 9a815289f9df5577f5fdf4c2463b614a93819b7d Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 11 Feb 2013 15:27:26 +1000
Subject: [PATCH] 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.

Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/vmmouse.c | 6 ++++--
 1 file 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);
 }
-- 
1.8.4.5

Places

File U_Don-t-de-reference-pMse-if-it-hasn-t-been-initialise.patch of Package xf86-input-vmmouse (Revision 1722d00322e9cf1d37c904df36fe071d)

Places