From be5d45fb2edff1f8b30b2edc03b79c11e957a8bc Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 28 Sep 2009 14:29:45 +0200 Subject: [PATCH] xf86-input-evdev: - add patch to fix potential null pointer dereferencement --- .../patches/100_mbemu_nullptr.diff | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 packages/x11/driver/xf86-input-evdev/patches/100_mbemu_nullptr.diff diff --git a/packages/x11/driver/xf86-input-evdev/patches/100_mbemu_nullptr.diff b/packages/x11/driver/xf86-input-evdev/patches/100_mbemu_nullptr.diff new file mode 100644 index 0000000000..b30e7f4213 --- /dev/null +++ b/packages/x11/driver/xf86-input-evdev/patches/100_mbemu_nullptr.diff @@ -0,0 +1,30 @@ +diff -Nurp xserver-xorg-input-evdev-2.2.2/src/emuMB.c xserver-xorg-input-evdev-2.2.2-working/src/emuMB.c +--- xserver-xorg-input-evdev-2.2.2/src/emuMB.c 2009-03-22 23:35:13.000000000 -0700 ++++ xserver-xorg-input-evdev-2.2.2-working/src/emuMB.c 2009-07-30 14:30:19.000000000 -0700 +@@ -280,7 +280,7 @@ void EvdevMBEmuWakeupHandler(pointer dat + EvdevPtr pEvdev = (EvdevPtr)pInfo->private; + int ms; + +- if (pEvdev->emulateMB.pending) ++ if (pEvdev && pEvdev->emulateMB.pending) + { + ms = pEvdev->emulateMB.expires - GetTimeInMillis(); + if (ms <= 0) +@@ -296,7 +296,7 @@ void EvdevMBEmuBlockHandler(pointer data + EvdevPtr pEvdev= (EvdevPtr) pInfo->private; + int ms; + +- if (pEvdev->emulateMB.pending) ++ if (pEvdev && pEvdev->emulateMB.pending) + { + ms = pEvdev->emulateMB.expires - GetTimeInMillis (); + if (ms <= 0) +@@ -346,7 +346,7 @@ void + EvdevMBEmuEnable(InputInfoPtr pInfo, BOOL enable) + { + EvdevPtr pEvdev = (EvdevPtr)pInfo->private; +- if (pEvdev->emulateMB.enabled == MBEMU_AUTO) ++ if (pEvdev && pEvdev->emulateMB.enabled == MBEMU_AUTO) + pEvdev->emulateMB.enabled = enable; + } +