mirror of
https://github.com/hyprwm/Hyprland.git
synced 2025-07-30 19:51:55 -07:00
protocols: Fix IWaylandProtocol onDisplayDestroy m_pGlobal double-free (#9507)
This commit is contained in:
@@ -14,7 +14,10 @@ static void displayDestroyInternal(struct wl_listener* listener, void* data) {
|
|||||||
void IWaylandProtocol::onDisplayDestroy() {
|
void IWaylandProtocol::onDisplayDestroy() {
|
||||||
wl_list_remove(&m_liDisplayDestroy.listener.link);
|
wl_list_remove(&m_liDisplayDestroy.listener.link);
|
||||||
wl_list_init(&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) :
|
IWaylandProtocol::IWaylandProtocol(const wl_interface* iface, const int& ver, const std::string& name) :
|
||||||
@@ -38,7 +41,8 @@ IWaylandProtocol::~IWaylandProtocol() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void IWaylandProtocol::removeGlobal() {
|
void IWaylandProtocol::removeGlobal() {
|
||||||
wl_global_remove(m_pGlobal);
|
if (m_pGlobal)
|
||||||
|
wl_global_remove(m_pGlobal);
|
||||||
}
|
}
|
||||||
|
|
||||||
wl_global* IWaylandProtocol::getGlobal() {
|
wl_global* IWaylandProtocol::getGlobal() {
|
||||||
|
Reference in New Issue
Block a user