From a8f367a4b81a9a468eb7a953a0522f47ab18a54d Mon Sep 17 00:00:00 2001 From: Timo Schwarzer Date: Thu, 3 Jan 2019 13:59:37 +0100 Subject: Check if p_child is not null in Container.fit_child_rect() Fixes #24725 --- scene/gui/container.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/scene/gui/container.cpp b/scene/gui/container.cpp index c58975d332..2579321773 100644 --- a/scene/gui/container.cpp +++ b/scene/gui/container.cpp @@ -95,6 +95,7 @@ void Container::_sort_children() { void Container::fit_child_in_rect(Control *p_child, const Rect2 &p_rect) { + ERR_FAIL_COND(!p_child); ERR_FAIL_COND(p_child->get_parent() != this); Size2 minsize = p_child->get_combined_minimum_size(); -- cgit v1.2.3