mirror of
https://github.com/reactos/reactos.git
synced 2024-07-01 02:10:07 +00:00
[NTUSER]
- Prevent a null to be passed to UserDereferenceObject in UserSetCursorIconData. CID 1321971 - Make the status check in co_IntCallSentMessageCallback less useless. CID 1322014 - Prevent a null pointer dereference in a trace in IntCreateClass. CID 514617 svn path=/trunk/; revision=73879
This commit is contained in:
parent
53fdca886e
commit
4f72307675
|
@ -279,6 +279,7 @@ co_IntCallSentMessageCallback(SENDASYNCPROC CompletionCallback,
|
|||
|
||||
if (!NT_SUCCESS(Status))
|
||||
{
|
||||
ERR("KeUserModeCallback failed with %lx\n", Status);
|
||||
return;
|
||||
}
|
||||
return;
|
||||
|
|
|
@ -47,10 +47,10 @@ CreateCallProc(IN PDESKTOP Desktop,
|
|||
NewCallProc->pfnClientPrevious = WndProc;
|
||||
NewCallProc->wType |= Unicode ? UserGetCPDA2U : UserGetCPDU2A ;
|
||||
NewCallProc->spcpdNext = NULL;
|
||||
}
|
||||
|
||||
/* Release the extra reference (UserCreateObject added 2 references) */
|
||||
if (NewCallProc != NULL) UserDereferenceObject(NewCallProc);
|
||||
/* Release the extra reference (UserCreateObject added 2 references) */
|
||||
UserDereferenceObject(NewCallProc);
|
||||
}
|
||||
|
||||
return NewCallProc;
|
||||
}
|
||||
|
|
|
@ -1228,7 +1228,8 @@ NoMem:
|
|||
}
|
||||
|
||||
TRACE("Created class 0x%p with name %wZ and proc 0x%p for atom 0x%x and version atom 0x%x and hInstance 0x%p, global %u\n",
|
||||
Class, ClassName, Class->lpfnWndProc, Atom, verAtom, Class->hModule, Class->Global);
|
||||
Class, ClassName, Class ? Class->lpfnWndProc : NULL, Atom, verAtom,
|
||||
Class ? Class->hModule : NULL , Class ? Class->Global : 0);
|
||||
|
||||
return Class;
|
||||
}
|
||||
|
@ -2332,6 +2333,7 @@ UserRegisterSystemClasses(VOID)
|
|||
if (SYSTEMCUR(ARROW) == NULL)
|
||||
{
|
||||
ERR("SYSTEMCUR(ARROW) == NULL, should not happen!!\n");
|
||||
ASSERT(FALSE);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -1494,7 +1494,9 @@ Exit:
|
|||
}
|
||||
|
||||
/* Dereference the cursor and return the result */
|
||||
UserDereferenceObject(pcur);
|
||||
if (pcur)
|
||||
UserDereferenceObject(pcur);
|
||||
|
||||
return bResult;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue