Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTUSER] Address memory leak in co_WinPosSetWindowPos(). (#7284)

Browse source 
CORE-19723
This commit is contained in:
Marek Benc 2024-08-31 22:07:33 +02:00 committed by GitHub
parent 163f3407c8
commit 633d2e6d0c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
win32ss/user/ntuser/winpos.c
View file

@ -2071,11 +2071,6 @@ co_WinPosSetWindowPos(
RgnType = IntGdiCombineRgn(CopyRgn, VisAfter, VisBeforeJustClient, RGN_AND); RgnType = IntGdiCombineRgn(CopyRgn, VisAfter, VisBeforeJustClient, RGN_AND);
} }
if (VisBeforeJustClient != NULL)
{
REGION_Delete(VisBeforeJustClient);
}
/* Now use in copying bits which are in the update region. */ /* Now use in copying bits which are in the update region. */
if (Window->hrgnUpdate != NULL) if (Window->hrgnUpdate != NULL)
{ {
@ -2223,11 +2218,6 @@ co_WinPosSetWindowPos(
} }
} }
if (CopyRgn != NULL)
{
REGION_Delete(CopyRgn);
}
/* Expose what was covered before but not covered anymore */ /* Expose what was covered before but not covered anymore */
if (VisBefore != NULL) if (VisBefore != NULL)
{ {
@ -2248,12 +2238,6 @@ co_WinPosSetWindowPos(
} }
REGION_Delete(ExposedRgn); REGION_Delete(ExposedRgn);
} }
REGION_Delete(VisBefore);
}
if (VisAfter != NULL)
{
REGION_Delete(VisAfter);
} }
} }
@ -2301,6 +2285,27 @@ co_WinPosSetWindowPos(
WinPos.flags |= SWP_NOZORDER|SWP_NOREDRAW; WinPos.flags |= SWP_NOZORDER|SWP_NOREDRAW;
} }
if (VisBefore != NULL)
{
REGION_Delete(VisBefore);
VisBefore = NULL;
}
if (VisBeforeJustClient != NULL)
{
REGION_Delete(VisBeforeJustClient);
VisBeforeJustClient = NULL;
}
if (VisAfter != NULL)
{
REGION_Delete(VisAfter);
VisAfter = NULL;
}
if (CopyRgn != NULL)
{
REGION_Delete(CopyRgn);
CopyRgn = NULL;
}
if(!(flags & SWP_DEFERERASE)) if(!(flags & SWP_DEFERERASE))
{ {
/* erase parent when hiding or resizing child */ /* erase parent when hiding or resizing child */