Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-15 15:58:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

- OutputDebugStringA: Handle freeing memory in case of an exception.

Browse source 
svn path=/trunk/; revision=40558
This commit is contained in:
Michael Martin 2009-04-17 11:09:22 +00:00
parent 9cbd1dc647
commit 6eb489a9c6
1 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
reactos/dll/win32/kernel32/debug/output.c
View file

@ -246,6 +246,8 @@ OutputDebugStringA(LPCSTR _OutputString)
_SEH2_TRY _SEH2_TRY
{ {
volatile PCHAR a_cBuffer = NULL;
/* opening the mutex failed */ /* opening the mutex failed */
if(hDBMonMutex == NULL) if(hDBMonMutex == NULL)
{ {
@ -339,9 +341,14 @@ OutputDebugStringA(LPCSTR _OutputString)
else else
{ {
/* output in blocks of 512 characters */ /* output in blocks of 512 characters */
volatile PCHAR a_cBuffer;
a_cBuffer = (CHAR*)HeapAlloc(GetProcessHeap(), 0, 512); a_cBuffer = (CHAR*)HeapAlloc(GetProcessHeap(), 0, 512);
if (!a_cBuffer)
{
DbgPrint("OutputDebugStringA: Failed\n");
break;
}
/* write a maximum of 511 bytes */ /* write a maximum of 511 bytes */
if(nOutputStringLen > 510) if(nOutputStringLen > 510)
nRoundLen = 510; nRoundLen = 510;
@ -357,7 +364,11 @@ OutputDebugStringA(LPCSTR _OutputString)
/* send the current block to the kernel debugger */ /* send the current block to the kernel debugger */
DbgPrint("%s", a_cBuffer); DbgPrint("%s", a_cBuffer);
HeapFree(GetProcessHeap(), 0, a_cBuffer); if (a_cBuffer)
{
HeapFree(GetProcessHeap(), 0, a_cBuffer);
a_cBuffer = NULL;
}
} }
/* move to the next block */ /* move to the next block */
@ -370,6 +381,9 @@ OutputDebugStringA(LPCSTR _OutputString)
/* ignore access violations and let other exceptions fall through */ /* ignore access violations and let other exceptions fall through */
_SEH2_EXCEPT((_SEH2_GetExceptionCode() == STATUS_ACCESS_VIOLATION) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH) _SEH2_EXCEPT((_SEH2_GetExceptionCode() == STATUS_ACCESS_VIOLATION) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH)
{ {
if (a_cBuffer)
HeapFree(GetProcessHeap(), 0, a_cBuffer);
/* string copied verbatim from Microsoft's kernel32.dll */ /* string copied verbatim from Microsoft's kernel32.dll */
DbgPrint("\nOutputDebugString faulted during output\n"); DbgPrint("\nOutputDebugString faulted during output\n");
} }