Fix get null handle in a valid qwobject

Fix null pointer access issue encountered in EventItem::contains,

When WXWaylandSurface calls safeDeleteLater to destroy, WSurface should invalidated in time

Author: wineee

qwlroots

@@ -202,6 +202,9 @@ QW_NAMESPACE::qw_object_basic *WWrapObject::handle() const
 bool WWrapObject::isInvalidated() const
 {
     W_DC(WWrapObject);
+
+    Q_ASSERT_X(d->invalidated || handle() != nullptr, Q_FUNC_INFO, "WWrapObject not invalidate in time");
+
     return d->invalidated;
 }
 

src/server/kernel/wglobal.cpp

@@ -64,8 +64,11 @@ class Q_DECL_HIDDEN WXWaylandSurfacePrivate : public WToplevelSurfacePrivate
 void WXWaylandSurfacePrivate::instantRelease()
 {
     handle()->set_data(nullptr, nullptr);
-    if (surface)
-        surface->removeAttachedData<WXWaylandSurface>();
+
+    if (!surface)
+        return;
+    surface->safeDeleteLater();
+    surface = nullptr;
 }
 
 void WXWaylandSurfacePrivate::init()

src/server/protocols/wxwaylandsurface.cpp

@@ -5,6 +5,7 @@
 
 #include "wsurfaceitem.h"
 #include "wsurface.h"
+#include "wwrappointer.h"
 
 #include <QQuickWindow>
 #include <QSGImageNode>
@@ -63,8 +64,8 @@ class Q_DECL_HIDDEN WSurfaceItemPrivate : public QQuickItemPrivate
     }
 
     Q_DECLARE_PUBLIC(WSurfaceItem)
-    QPointer<WSurface> surface;
-    QPointer<WToplevelSurface> shellSurface;
+    WWrapPointer<WSurface> surface;
+    WWrapPointer<WToplevelSurface> shellSurface;
     std::unique_ptr<SurfaceState> surfaceState;
     QQuickItem *contentContainer = nullptr;
     QQmlComponent *delegate = nullptr;