Fix undefined behavior in qwindow-compositor

m_xdgSurface and m_xdgPopup were left uninitialized. Fixes a crash when
resizing wl_shell clients.

Change-Id: I8f4b05e395ac6088d9f40bbe9cca6141ee12dfc9
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>

2 files changed, 9 insertions, 1 deletions

diff --git a/examples/wayland/qwindow-compositor/windowcompositor.cpp b/examples/wayland/qwindow-compositor/windowcompositor.cpp
index 5b3b69059..e91778725 100644
--- a/examples/wayland/qwindow-compositor/windowcompositor.cpp
+++ b/examples/wayland/qwindow-compositor/windowcompositor.cpp
@@ -51,6 +51,14 @@
 
 #include <QDebug>
 
+WindowCompositorView::WindowCompositorView()
+    : m_texture(0)
+    , m_wlShellSurface(nullptr)
+    , m_xdgSurface(nullptr)
+    , m_xdgPopup(nullptr)
+    , m_parentView(nullptr)
+{}
+
 GLuint WindowCompositorView::getTexture() {
     if (advance()) {
         if (m_texture)
diff --git a/examples/wayland/qwindow-compositor/windowcompositor.h b/examples/wayland/qwindow-compositor/windowcompositor.h
index c8b796ee9..96af01f82 100644
--- a/examples/wayland/qwindow-compositor/windowcompositor.h
+++ b/examples/wayland/qwindow-compositor/windowcompositor.h
@@ -58,7 +58,7 @@ class WindowCompositorView : public QWaylandView
 {
     Q_OBJECT
 public:
-    WindowCompositorView() : m_texture(0), m_wlShellSurface(0), m_parentView(0) {}
+    WindowCompositorView();
     GLuint getTexture();
     QPointF position() const { return m_position; }
     void setPosition(const QPointF &pos) { m_position = pos; }