ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-30 04:13:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CONSRV]

Browse Source 
- Fix console handle validation (triggered by recent Process changes by Alex).
- Temporarily add commented-out asserts for testing purposes only.

svn path=/trunk/; revision=59658
This commit is contained in:
Hermès Bélusca-Maïto
2013-08-06 19:10:36 +00:00
parent e3cc5db0e6
commit 732baee549
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/win32ss/user/winsrv/consrv/condrv/console.c
+10 -3
View File
@@ -143,9 +143,13 @@ static NTSTATUS
RemoveConsoleByHandle(IN HANDLE Handle)
{
NTSTATUS Status = STATUS_SUCCESS;
ULONG Index = HandleToULong(Handle) >> 2;
PCONSOLE Console;
BOOLEAN ValidHandle = ((HandleToULong(Handle) & 0x3) == 0x3);
ULONG Index = HandleToULong(Handle) >> 2;
if (!ValidHandle) return STATUS_INVALID_HANDLE;
ASSERT( (ConsoleList == NULL && ConsoleListSize == 0) ||
(ConsoleList != NULL && ConsoleListSize != 0) );
@@ -339,10 +343,13 @@ ConDrvValidateConsole(OUT PCONSOLE* Console,
IN BOOLEAN LockConsole)
{
BOOLEAN RetVal = FALSE;
ULONG Index = HandleToULong(ConsoleHandle) >> 2;
PCONSOLE ValidatedConsole;
BOOLEAN ValidHandle = ((HandleToULong(ConsoleHandle) & 0x3) == 0x3);
ULONG Index = HandleToULong(ConsoleHandle) >> 2;
if (!ValidHandle) return FALSE;
if (!Console) return FALSE;
*Console = NULL;
reactos/win32ss/user/winsrv/consrv/console.c
+1 -1
View File
@@ -159,7 +159,7 @@ VOID FASTCALL
ConSrvReleaseConsole(PCONSOLE Console,
BOOL WasConsoleLocked)
{
/* Just call the driver*/
/* Just call the driver */
ConDrvReleaseConsole(Console, WasConsoleLocked);
}
reactos/win32ss/user/winsrv/consrv/handle.c
+8
View File
@@ -387,6 +387,8 @@ ConSrvRemoveObject(PCONSOLE_PROCESS_DATA ProcessData,
RtlEnterCriticalSection(&ProcessData->HandleTableLock);
ASSERT(ProcessData->HandleTable);
// ASSERT( (ProcessData->HandleTable == NULL && ProcessData->HandleTableSize == 0) ||
// (ProcessData->HandleTable != NULL && ProcessData->HandleTableSize != 0) );
if (Index >= ProcessData->HandleTableSize ||
(Object = ProcessData->HandleTable[Index].Object) == NULL)
@@ -781,6 +783,9 @@ CSR_API(SrvVerifyConsoleIoHandle)
RtlEnterCriticalSection(&ProcessData->HandleTableLock);
// ASSERT( (ProcessData->HandleTable == NULL && ProcessData->HandleTableSize == 0) ||
// (ProcessData->HandleTable != NULL && ProcessData->HandleTableSize != 0) );
if (!IsConsoleHandle(ConsoleHandle) ||
Index >= ProcessData->HandleTableSize ||
ProcessData->HandleTable[Index].Object == NULL)
@@ -816,6 +821,9 @@ CSR_API(SrvDuplicateHandle)
RtlEnterCriticalSection(&ProcessData->HandleTableLock);
// ASSERT( (ProcessData->HandleTable == NULL && ProcessData->HandleTableSize == 0) ||
// (ProcessData->HandleTable != NULL && ProcessData->HandleTableSize != 0) );
if ( /** !IsConsoleHandle(ConsoleHandle) || **/
Index >= ProcessData->HandleTableSize ||
(Entry = &ProcessData->HandleTable[Index])->Object == NULL)