output/xdg-output: avoid sending events to released globals

ref #6835
hyprwm · Oct 8, 2024 · bc29992 · bc29992
1 parent ac65850
commit bc29992
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/protocols/XDGOutput.cpp b/src/protocols/XDGOutput.cpp
@@ -51,6 +51,8 @@ void CXDGOutputProtocol::onManagerGetXDGOutput(CZxdgOutputManagerV1* mgr, uint32
 #endif
  pXDGOutput->client = CLIENT;
 
+ pXDGOutput->outputProto = OUTPUT->owner;
+
  if (!pXDGOutput->resource->resource()) {
  m_vXDGOutputs.pop_back();
  mgr->noMemory();
@@ -104,7 +106,7 @@ CXDGOutput::CXDGOutput(SP<CZxdgOutputV1> resource_, SP<CMonitor> monitor_) : mon
 void CXDGOutput::sendDetails() {
  static auto PXWLFORCESCALEZERO = CConfigValue<Hyprlang::INT>("xwayland:force_zero_scaling");
 
- if (!monitor)
+ if (!monitor || !outputProto || outputProto->isDefunct())
  return;
 
  const auto POS = isXWayland ? monitor->vecXWaylandPosition : monitor->vecPosition;

diff --git a/src/protocols/XDGOutput.hpp b/src/protocols/XDGOutput.hpp
@@ -6,6 +6,7 @@
 
 class CMonitor;
 class CXDGOutputProtocol;
+class CWLOutputProtocol;
 
 class CXDGOutput {
  public:
@@ -16,6 +17,7 @@ class CXDGOutput {
  private:
  WP<CMonitor> monitor;
  SP<CZxdgOutputV1> resource;
+ WP<CWLOutputProtocol> outputProto;
 
  std::optional<Vector2D> overridePosition;
 

diff --git a/src/protocols/core/Output.cpp b/src/protocols/core/Output.cpp
@@ -47,7 +47,7 @@ SP<CWlOutput> CWLOutputResource::getResource() {
 }
 
 void CWLOutputResource::updateState() {
- if (!monitor || (owner && owner->defunct))
+ if (!monitor || !owner || owner->defunct)
  return;
 
  if (resource->version() >= 2)
@@ -119,6 +119,9 @@ bool CWLOutputProtocol::isDefunct() {
 }
 
 void CWLOutputProtocol::sendDone() {
+ if (defunct)
+ return;
+
  for (auto const& r : m_vOutputs) {
  r->resource->sendDone();
  }