Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-09 03:37:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32SS][NTGDI] 'otm' is always non-NULL in epilogue

Browse source
This commit is contained in:
Katayama Hirofumi MZ 2019-10-22 09:29:15 +09:00
parent f2f833c53c
commit 1bf982ff88
1 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
win32ss/gdi/ntgdi/font.c
View file

@ -928,25 +928,24 @@ NtGdiGetOutlineTextMetricsInternalW (HDC hDC,
return 0; return 0;
} }
IntGetOutlineTextMetrics(FontGDI, Size, potm); IntGetOutlineTextMetrics(FontGDI, Size, potm);
if (otm)
{
_SEH2_TRY
{
ProbeForWrite(otm, Size, 1);
RtlCopyMemory(otm, potm, Size);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
Status = _SEH2_GetExceptionCode();
}
_SEH2_END
if (!NT_SUCCESS(Status)) _SEH2_TRY
{ {
EngSetLastError(ERROR_INVALID_PARAMETER); ProbeForWrite(otm, Size, 1);
Size = 0; RtlCopyMemory(otm, potm, Size);
}
} }
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
Status = _SEH2_GetExceptionCode();
}
_SEH2_END
if (!NT_SUCCESS(Status))
{
EngSetLastError(ERROR_INVALID_PARAMETER);
Size = 0;
}
ExFreePoolWithTag(potm,GDITAG_TEXT); ExFreePoolWithTag(potm,GDITAG_TEXT);
return Size; return Size;
} }