wayland: fix session lock crashes and Qt 6.6.3 compatibility

Author: Luke458

changelog/next.md

@@ -2,3 +2,4 @@
 
 - Fixed ScreencopyView not displaying when only lock surfaces are shown.
 - Fixed WlSessionLockSurface.visible crashing if accessed before backing surface creation.
+- Fixed multiple session lock client crashes on sleep, wake, DPMS, and unlocking.

src/wayland/session_lock.cpp

@@ -143,13 +143,19 @@ void WlSessionLock::unlock() {
 	if (this->isLocked()) {
 		this->lockTarget = false;
 
-		this->manager->unlock();
+		for (auto* surface: this->surfaces) {
+			if (surface->ext != nullptr) {
+				surface->ext->destroySurface();
+			}
+		}
 
 		for (auto* surface: this->surfaces) {
 			delete surface;
 		}
 		this->surfaces.clear();
 
+		this->manager->unlock();
+
 		emit this->lockStateChanged();
 	}
 }
@@ -209,6 +215,10 @@ WlSessionLockSurface::WlSessionLockSurface(QObject* parent)
 }
 
 WlSessionLockSurface::~WlSessionLockSurface() {
+	if (this->ext != nullptr) {
+		this->ext->destroySurface();
+	}
+
 	if (this->window != nullptr) {
 		this->window->destroy();
 		this->window->deleteLater();

src/wayland/session_lock.hpp

@@ -185,4 +185,6 @@ private slots:
 	QScreen* mScreen = nullptr;
 	QColor mColor = Qt::white;
 	LockWindowExtension* ext;
+
+	friend class WlSessionLock;
 };

src/wayland/session_lock/session_lock.cpp

@@ -4,6 +4,7 @@
 #include <qlogging.h>
 #include <qobject.h>
 #include <qwindow.h>
+#include <wayland-client.h> // NOLINT(misc-include-cleaner)
 
 #include "lock.hpp"
 #include "manager.hpp"
@@ -117,3 +118,13 @@ void LockWindowExtension::setVisible() {
 	if (this->surface == nullptr) this->immediatelyVisible = true;
 	else this->surface->setVisible();
 }
+
+void LockWindowExtension::destroySurface() {
+	if (this->surface != nullptr) {
+		auto* lockObj = qobject_cast<QSWaylandSessionLock*>(this->lock.data());
+		if (lockObj != nullptr && lockObj->active()) {
+			this->surface->destroy();
+			this->surface = nullptr;
+		}
+	}
+}

src/wayland/session_lock/session_lock.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
 #include <qobject.h>
+#include <qpointer.h>
 #include <qtclasshelpermacros.h>
 #include <qtmetamacros.h>
 #include <qwindow.h>
-#include <qpointer.h>
 
 class QSWaylandSessionLock;
 class QSWaylandSessionLockSurface;
@@ -74,6 +74,7 @@ class LockWindowExtension: public QObject {
 	// This must be called in place of QWindow::setVisible. Calling QWindow::setVisible will result in a crash.
 	// To make a window invisible, destroy it as it cannot be recovered.
 	void setVisible();
+	void destroySurface();
 
 	static LockWindowExtension* get(QWindow* window);
 

src/wayland/session_lock/surface.cpp

@@ -8,7 +8,6 @@
 #include <qobject.h>
 #include <qtversionchecks.h>
 #include <qtypes.h>
-#include <wayland-client.h> // NOLINT(misc-include-cleaner)
 
 #include "lock.hpp"
 #include "session_lock.hpp"
@@ -40,6 +39,10 @@ QSWaylandSessionLockSurface::QSWaylandSessionLockSurface(QtWaylandClient::QWayla
 }
 
 QSWaylandSessionLockSurface::~QSWaylandSessionLockSurface() {
+	if (this->object() == nullptr) {
+		return;
+	}
+
 	bool shouldDestroyOnServer = true;
 
 	if (this->ext != nullptr) {
@@ -50,8 +53,11 @@ QSWaylandSessionLockSurface::~QSWaylandSessionLockSurface() {
 		} else {
 			auto* qwindow = this->window() ? this->window()->window() : nullptr;
 			auto* screen = qwindow ? qwindow->screen() : nullptr;
-			auto* waylandScreen = screen ? dynamic_cast<QtWaylandClient::QWaylandScreen*>(screen->handle()) : nullptr;
-			if (waylandScreen == nullptr || waylandScreen->isPlaceholder() || waylandScreen->output() == nullptr) {
+			auto* waylandScreen =
+			    screen ? dynamic_cast<QtWaylandClient::QWaylandScreen*>(screen->handle()) : nullptr;
+			if (waylandScreen == nullptr || waylandScreen->isPlaceholder()
+			    || waylandScreen->output() == nullptr)
+			{
 				shouldDestroyOnServer = false;
 			}
 		}
@@ -61,10 +67,6 @@ QSWaylandSessionLockSurface::~QSWaylandSessionLockSurface() {
 
 	if (shouldDestroyOnServer) {
 		this->destroy();
-	} else {
-		if (auto* obj = this->object()) {
-			wl_proxy_destroy(reinterpret_cast<wl_proxy*>(obj)); // NOLINT(misc-include-cleaner)
-		}
 	}
 }