!32 fix coredump of ukui-menu
From: @peijiankang Reviewed-by: @dou33 Signed-off-by: @dou33
This commit is contained in:
commit
d9a88349bd
52
0002-fix-coredump-of-ukui-menu.patch
Normal file
52
0002-fix-coredump-of-ukui-menu.patch
Normal file
@ -0,0 +1,52 @@
|
||||
From 443a316ff98be2cfb1c7cdb3725489789ac504b9 Mon Sep 17 00:00:00 2001
|
||||
From: peijiankang <peijiankang@kylinos.cn>
|
||||
Date: Fri, 10 Feb 2023 16:48:13 +0800
|
||||
Subject: [PATCH] fix coredump of ukui-menu
|
||||
|
||||
---
|
||||
src/UserInterface/ListView/klistview.cpp | 12 +++++++++---
|
||||
src/UserInterface/ListView/listview.cpp | 5 ++++-
|
||||
2 files changed, 13 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/UserInterface/ListView/klistview.cpp b/src/UserInterface/ListView/klistview.cpp
|
||||
index 012b52a..33c5bc0 100755
|
||||
--- a/src/UserInterface/ListView/klistview.cpp
|
||||
+++ b/src/UserInterface/ListView/klistview.cpp
|
||||
@@ -11,9 +11,15 @@ KListView::KListView(QWidget *parent):
|
||||
|
||||
KListView::~KListView()
|
||||
{
|
||||
- delete m_delegate;
|
||||
- delete listmodel;
|
||||
- delete pUkuiMenuInterface;
|
||||
+ if (m_delegate) {
|
||||
+ delete m_delegate;
|
||||
+ m_delegate = nullptr;
|
||||
+ }
|
||||
+
|
||||
+ if (listmodel) {
|
||||
+ delete listmodel;
|
||||
+ listmodel = nullptr;
|
||||
+ }
|
||||
}
|
||||
|
||||
void KListView::addData(QStringList data)
|
||||
diff --git a/src/UserInterface/ListView/listview.cpp b/src/UserInterface/ListView/listview.cpp
|
||||
index 9bd82c4..e6027b6 100755
|
||||
--- a/src/UserInterface/ListView/listview.cpp
|
||||
+++ b/src/UserInterface/ListView/listview.cpp
|
||||
@@ -37,7 +37,10 @@ ListView::ListView(QWidget *parent/*, int width, int height, int module*/):
|
||||
|
||||
ListView::~ListView()
|
||||
{
|
||||
- delete pUkuiMenuInterface;
|
||||
+ if (pUkuiMenuInterface) {
|
||||
+ delete pUkuiMenuInterface;
|
||||
+ pUkuiMenuInterface = nullptr;
|
||||
+ }
|
||||
}
|
||||
|
||||
void ListView::initWidget()
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@ -1,11 +1,12 @@
|
||||
Name: ukui-menu
|
||||
Version: 3.1.1
|
||||
Release: 3
|
||||
Release: 4
|
||||
Summary: Advanced ukui menu
|
||||
License: GPL-3.0-or-later
|
||||
URL: http://www.ukui.org
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
Patch01: 0001-fix-uninstall-failed-issue.patch
|
||||
Patch02: 0002-fix-coredump-of-ukui-menu.patch
|
||||
|
||||
BuildRequires: qt5-qtbase-devel
|
||||
BuildRequires: libqtxdg-devel
|
||||
@ -37,6 +38,7 @@ Requires: accountsservice
|
||||
%prep
|
||||
%setup -q
|
||||
%patch01 -p1
|
||||
%patch02 -p1
|
||||
|
||||
%build
|
||||
mkdir build && cd build
|
||||
@ -57,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_datadir}/ukui-menu/translations/
|
||||
|
||||
%changelog
|
||||
* Fri Feb 10 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.1-4
|
||||
- fix coredump of ukui-menu
|
||||
|
||||
* Wed Feb 1 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.1-3
|
||||
- fix uninstall failed issue
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user