Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-05 02:36:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FancyZones] Validate zone rect before adding it into layout (#6249)

Browse Source 
* Validate zone rect before adding it into layout

* Rename variables for better code readability
This commit is contained in:
vldmr11080
2020-09-08 12:06:54 +02:00
committed by GitHub
parent c5f90272d1
commit 13426eac50
3 changed files with 100 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/modules/fancyzones/lib/Zone.cpp
View File

@@ -11,6 +11,16 @@
#include "common/monitors.h"
namespace
{
bool ValidateZoneRect(const RECT& rect)
{
int width = rect.right - rect.left;
int height = rect.bottom - rect.top;
return rect.left >= 0 && rect.right >= 0 && rect.top >= 0 && rect.bottom >= 0 && width >= 0 && height >= 0;
}
}
struct Zone : winrt::implements<Zone, IZone>
{
public:
@@ -122,5 +132,12 @@ RECT Zone::ComputeActualZoneRect(HWND window, HWND zoneWindow) noexcept
winrt::com_ptr<IZone> MakeZone(const RECT& zoneRect) noexcept
{
return winrt::make_self<Zone>(zoneRect);
if (ValidateZoneRect(zoneRect))
{
return winrt::make_self<Zone>(zoneRect);
}
else
{
return nullptr;
}
}