Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-31 23:18:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOSKRNL]

Browse source 
- Always set response in ExpRaiseHardError. Fixes ntoskrnl:ExHardError kmtest
[WIN32CSR]
- Don't corrupt memory. Fixes random crashes when running ntoskrnl:ExHardError kmtest

svn path=/trunk/; revision=56153
This commit is contained in:
Rafal Harabien 2012-03-14 23:08:48 +00:00
parent f5d2c36849
commit 88091ae0cd
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/ntoskrnl/ex/harderr.c
View file

@ -136,6 +136,7 @@ ExpRaiseHardError(IN NTSTATUS ErrorStatus,
if (!SeSinglePrivilegeCheck(SeShutdownPrivilege, PreviousMode)) if (!SeSinglePrivilegeCheck(SeShutdownPrivilege, PreviousMode))
{ {
/* No rights */ /* No rights */
*Response = ResponseNotHandled;
return STATUS_PRIVILEGE_NOT_HELD; return STATUS_PRIVILEGE_NOT_HELD;
} }
@ -248,6 +249,11 @@ ExpRaiseHardError(IN NTSTATUS ErrorStatus,
/* Set the response */ /* Set the response */
*Response = Message->Response; *Response = Message->Response;
} }
else
{
/* Set the response */
*Response = ResponseReturnToCaller;
}
} }
else else
{ {

2
reactos/subsystems/win32/csrss/win32csr/harderror.c
View file

@ -323,7 +323,7 @@ CsrpFormatMessages(
RtlAppendUnicodeStringToString(CaptionStringU, &TempStringU); RtlAppendUnicodeStringToString(CaptionStringU, &TempStringU);
/* Zero terminate the buffer */ /* Zero terminate the buffer */
CaptionStringU->Buffer[CaptionStringU->Length] = 0; CaptionStringU->Buffer[CaptionStringU->Length / sizeof(WCHAR)] = 0;
/* Free the file name buffer */ /* Free the file name buffer */
RtlFreeUnicodeString(&FileNameU); RtlFreeUnicodeString(&FileNameU);