From 445337d03dce7c9aef10ff4d57fc516ac8c1b24d Mon Sep 17 00:00:00 2001 From: Lee Bousfield Date: Thu, 27 Feb 2025 19:52:31 -0600 Subject: [PATCH] protocols: Fix IWaylandProtocol onDisplayDestroy m_pGlobal double-free (#9507) --- src/protocols/WaylandProtocol.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/protocols/WaylandProtocol.cpp b/src/protocols/WaylandProtocol.cpp index 7fef5179e..48bd6d2a2 100644 --- a/src/protocols/WaylandProtocol.cpp +++ b/src/protocols/WaylandProtocol.cpp @@ -14,7 +14,10 @@ static void displayDestroyInternal(struct wl_listener* listener, void* data) { void IWaylandProtocol::onDisplayDestroy() { wl_list_remove(&m_liDisplayDestroy.listener.link); wl_list_init(&m_liDisplayDestroy.listener.link); - wl_global_destroy(m_pGlobal); + if (m_pGlobal) { + wl_global_destroy(m_pGlobal); + m_pGlobal = nullptr; + } } IWaylandProtocol::IWaylandProtocol(const wl_interface* iface, const int& ver, const std::string& name) : @@ -38,7 +41,8 @@ IWaylandProtocol::~IWaylandProtocol() { } void IWaylandProtocol::removeGlobal() { - wl_global_remove(m_pGlobal); + if (m_pGlobal) + wl_global_remove(m_pGlobal); } wl_global* IWaylandProtocol::getGlobal() {