Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package qt6-wayland for openSUSE:Factory 
checked in at 2024-11-09 20:54:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-wayland (Old)
 and      /work/SRC/openSUSE:Factory/.qt6-wayland.new.2017 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "qt6-wayland"

Sat Nov  9 20:54:06 2024 rev:40 rq:1222864 version:6.8.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/qt6-wayland/qt6-wayland.changes  2024-10-17 
18:38:11.835399059 +0200
+++ /work/SRC/openSUSE:Factory/.qt6-wayland.new.2017/qt6-wayland.changes        
2024-11-09 20:57:39.540643402 +0100
@@ -1,0 +2,6 @@
+Fri Nov  8 14:10:37 UTC 2024 - Hillwood Yang <hillw...@opensuse.org>
+
+- Add 0001-fix-crash-issue.patch
+  fix crash when attach differ shellsurface to the same shellsurfaceitem 
(boo#1233141)
+
+-------------------------------------------------------------------

New:
----
  0001-fix-crash-issue.patch

BETA DEBUG BEGIN:
  New:
- Add 0001-fix-crash-issue.patch
  fix crash when attach differ shellsurface to the same shellsurfaceitem 
(boo#1233141)
BETA DEBUG END:

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ qt6-wayland.spec ++++++
--- /var/tmp/diff_new_pack.Da2mTD/_old  2024-11-09 20:57:40.048664534 +0100
+++ /var/tmp/diff_new_pack.Da2mTD/_new  2024-11-09 20:57:40.052664700 +0100
@@ -40,6 +40,10 @@
 Source99:       qt6-wayland-rpmlintrc
 # PATCH-FIX-UPSTREAM
 Patch0:         0001-update-wayland_xml-to-version-1_23_0.patch
+# PATCH-FIX-UPSTREAM
+# fix crash when attach differ shellsurface to the same shellsurfaceitem
+# https://codereview.qt-project.org/c/qt/qtwayland/+/599732
+Patch1:         0001-fix-crash-issue.patch
 BuildRequires:  pkgconfig
 BuildRequires:  qt6-core-private-devel
 BuildRequires:  qt6-gui-private-devel

++++++ 0001-fix-crash-issue.patch ++++++
>From 6f87a84b8e72c3676ee9cf7190b8ae1f82387353 Mon Sep 17 00:00:00 2001
From: Heng Liu <liuhe...@uniontech.com>
Date: Fri, 25 Oct 2024 10:17:45 +0800
Subject: [PATCH] fix crash when attach differ shellsurface to the same 
shellsurfaceitem

Change shellSurface from a raw pointer to a QPointer to prevent
crash caused by accessing the wild pointer when shellSurface is destroyed

Pick-to: 6.8
Change-Id: Iabf25ce9e3fab416b5b927bf768e94398516a710
---

diff --git a/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h 
b/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h
index 46e5f65..10b10a0 100644
--- a/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h
+++ b/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h
@@ -41,7 +41,7 @@
     void lower() override;
 
     QWaylandQuickShellIntegration *m_shellIntegration = nullptr;
-    QWaylandShellSurface *m_shellSurface = nullptr;
+    QPointer<QWaylandShellSurface> m_shellSurface = nullptr;
     QQuickItem *m_moveItem = nullptr;
     bool m_autoCreatePopupItems = true;
     bool staysOnTop = false;

Reply via email to