XLibre/xf86-input-mouse
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-input-mouse.git synced 2026-03-24 01:24:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid NULL pointer dereference in autoProbeMouse if proto == PROT_UNSUP

Browse Source 
Error: Null pointer dereference (CWE 476)
   Read from null pointer 'GetProtocol(proto)'
        at line 3477 of src/mouse.c in function 'autoProbeMouse'.
          Function 'GetProtocol' may return constant 'NULL' at line 736, called at line 3477.
          Null pointer introduced at line 736 in function 'GetProtocol'.

We already handle one of the two cases that make GetProtocol return NULL,
proto == PROTO_UNKNOWN, but not PROT_UNSUP.

[ This bug was found by the Parfait 0.4.2 bug checking tool.
  For more information see http://labs.oracle.com/projects/parfait/ ]

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Alexandr Shadchin <alexandr.shadchin@gmail.com>
This commit is contained in:
Alan Coopersmith
2011-11-30 19:29:01 -08:00
parent b65651974e
commit 8bc8502c69
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mouse.c
View File

@@ -3469,12 +3469,14 @@ autoProbeMouse(InputInfoPtr pInfo, Bool inSync, Bool lostSync)
case AUTOPROBE_SWITCH_PROTOCOL:
{
MouseProtocolID proto;
MouseProtocolPtr pProto;
void *defaults;
AP_DBG(("State SWITCH_PROTOCOL\n"));
proto = mPriv->protoList[mPriv->protocolID++];
if (proto == PROT_UNKNOWN)
mPriv->autoState = AUTOPROBE_SWITCHSERIAL;
else if (!(defaults = GetProtocol(proto)->defaults)
else if (!((pProto = GetProtocol(proto)) &&
((defaults = pProto->defaults)))
|| (mPriv->serialDefaultsNum == -1
&& (defaults == msDefaults))
|| (mPriv->serialDefaultsNum != -1