From 6ce9b77b3c8d7c082c49953d1253249bbcff7ddf Mon Sep 17 00:00:00 2001
From: James Graham <james.h.graham@protonmail.com>
Date: Tue, 20 May 2025 17:22:43 +0100
Subject: [PATCH] Set m_quickActionIncubating and m_compactBackgroundIncubating
 to avoid heap-use-after-free

---
 src/timeline/messagedelegate.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/timeline/messagedelegate.cpp b/src/timeline/messagedelegate.cpp
index c3cc70648..a62750fe7 100644
--- a/src/timeline/messagedelegate.cpp
+++ b/src/timeline/messagedelegate.cpp
@@ -424,8 +424,8 @@ void MessageDelegateBase::updateBackground()
                     }
                     markAsDirty();
                 }
-                cleanupIncubator(incubator);
                 m_compactBackgroundIncubating = false;
+                cleanupIncubator(incubator);
             },
             m_errorCallback);
         m_compactBackgroundComponent->create(*compactBackgroundIncubator, qmlContext(m_compactBackgroundComponent));
@@ -472,8 +472,8 @@ void MessageDelegateBase::updateQuickAction()
                     }
                     markAsDirty();
                 }
-                cleanupIncubator(incubator);
                 m_quickActionIncubating = false;
+                cleanupIncubator(incubator);
             },
             m_errorCallback);
         m_quickActionComponent->create(*quickActionIncubator, qmlContext(m_quickActionComponent));