mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-06 06:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Possible fix for crash in Window::limitPosition() when parent is nullptr (fix #4261)

Browse Source 
We cannot reproduce this but just adding a check here to avoid using a
nullptr parent pointer.
This commit is contained in:
David Capello 2024-01-08 15:07:36 -03:00
parent 00894101e0
commit 9d69cb8dfe
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ui/window.cpp
View File

@ -1,5 +1,5 @@
// Aseprite UI Library
// Copyright (C) 2018-2023 Igara Studio S.A.
// Copyright (C) 2018-2024 Igara Studio S.A.
// Copyright (C) 2001-2017 David Capello
//
// This file is released under the terms of the MIT license.
@ -765,12 +765,17 @@ void Window::limitSize(gfx::Size& size)
void Window::limitPosition(gfx::Rect& rect)
{
auto parent = this->parent();
ASSERT(parent);
if (!parent)
return;
if (rect.y < 0) {
rect.y = 0;
rect.h = bounds().h;
}
auto titlebarH = childrenBounds().y - bounds().y;
auto limitB = parent()->bounds().y2() - titlebarH;
auto limitB = parent->bounds().y2() - titlebarH;
if (rect.y > limitB) {
rect.y = limitB;
rect.h = bounds().h;
@ -781,7 +786,7 @@ void Window::limitPosition(gfx::Rect& rect)
rect.x = limitL;
rect.w = bounds().w;
}
auto limitR = parent()->bounds().x2() - border().right();
auto limitR = parent->bounds().x2() - border().right();
if (rect.x > limitR) {
rect.x = limitR;
rect.w = bounds().w;