From 5a7d459c2b0f3cc4e07661c12db61b312ba392c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaakko=20Kera=CC=88nen?= Date: Wed, 14 Dec 2022 23:55:01 +0200 Subject: [PATCH 1/1] Fixed a possible crash when closing tabs in split view mode --- src/app.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/app.c b/src/app.c index 7e811bfa..7115c939 100644 --- a/src/app.c +++ b/src/app.c @@ -4030,10 +4030,14 @@ iBool handleCommand_App(const char *cmd) { } const iBool isSplit = numRoots_Window(get_Window()) > 1; if (tabCount_Widget(tabs) > 1 || isSplit) { - iDocumentWidget *closed = (iDocumentWidget *) removeTabPage_Widget(tabs, index); - pushClosedTabUrl_App_(d, url_DocumentWidget(closed)); - cancelAllRequests_DocumentWidget(closed); - destroy_Widget(as_Widget(closed)); /* released later */ + if (index != iInvalidPos) { + iAssert(doc); + iDocumentWidget *closed = (iDocumentWidget *) removeTabPage_Widget(tabs, index); + iAssert(closed); + pushClosedTabUrl_App_(d, url_DocumentWidget(closed)); + cancelAllRequests_DocumentWidget(closed); + destroy_Widget(as_Widget(closed)); /* released later */ + } if (index == tabCount_Widget(tabs)) { index--; } -- 2.34.1