From d82538c69fa4dd8c6f462309eb72a7192d3e1f94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Tue, 4 Nov 2025 15:13:50 +0000
Subject: [PATCH] protocols/dmabuf: handle null pointer in
 CLinuxDMABufV1Protocol::resetFormatTable (#12207)

---
 src/protocols/LinuxDMABUF.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/protocols/LinuxDMABUF.cpp b/src/protocols/LinuxDMABUF.cpp
index 0ad804c3..ac0dfc36 100644
--- a/src/protocols/LinuxDMABUF.cpp
+++ b/src/protocols/LinuxDMABUF.cpp
@@ -507,13 +507,17 @@ void CLinuxDMABufV1Protocol::resetFormatTable() {
         if (feedback->m_lastFeedbackWasScanout) {
             PHLMONITOR mon;
             auto       HLSurface = CWLSurface::fromResource(feedback->m_surface);
+            if (!HLSurface) {
+                feedback->sendDefaultFeedback();
+                continue;
+            }
             if (auto w = HLSurface->getWindow(); w)
                 if (auto m = w->m_monitor.lock(); m)
                     mon = m->m_self.lock();
 
             if (!mon) {
                 feedback->sendDefaultFeedback();
-                return;
+                continue;
             }
 
             updateScanoutTranche(feedback->m_surface, mon);