From 41712f9da75bb2430fef3bc0b4f15770162eb70e Mon Sep 17 00:00:00 2001 From: liweigang Date: Thu, 21 Mar 2024 14:44:48 +0800 Subject: [PATCH] fix: Array out of bounds causes crash handling Signed-off-by: liweigang --- ...-out-of-bounds-causes-crash-handling.patch | 32 +++++++++++++++++++ dde-control-center.spec | 7 +++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 0001-fix-Array-out-of-bounds-causes-crash-handling.patch diff --git a/0001-fix-Array-out-of-bounds-causes-crash-handling.patch b/0001-fix-Array-out-of-bounds-causes-crash-handling.patch new file mode 100644 index 0000000..53f01f9 --- /dev/null +++ b/0001-fix-Array-out-of-bounds-causes-crash-handling.patch @@ -0,0 +1,32 @@ +From 96ad287f01dc69ae1f98f2fd884fc0a97b1cc234 Mon Sep 17 00:00:00 2001 +From: liweigang +Date: Fri, 22 Mar 2024 09:48:17 +0800 +Subject: [PATCH] fix: Array out of bounds causes crash handling + +Signed-off-by: liweigang +--- + src/frame/window/modules/systeminfo/systeminfowidget.cpp | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/frame/window/modules/systeminfo/systeminfowidget.cpp b/src/frame/window/modules/systeminfo/systeminfowidget.cpp +index 0d753d4..745fb19 100644 +--- a/src/frame/window/modules/systeminfo/systeminfowidget.cpp ++++ b/src/frame/window/modules/systeminfo/systeminfowidget.cpp +@@ -95,6 +95,14 @@ void SystemInfoWidget::initData() + connect(m_listView, &DListView::clicked, this, &SystemInfoWidget::onListClicked); + connect(m_listView, &DListView::activated, m_listView, &DListView::clicked); + connect(GSettingWatcher::instance(), &GSettingWatcher::requestUpdateSecondMenu, this, &SystemInfoWidget::onRequestUpdateSecondMenu); ++ if (IsServerSystem) { ++ connect(GSettingWatcher::instance(), ++ &GSettingWatcher::requestUpdateSecondMenu, this, [this](int row) { ++ if (m_itemList.size() > row && m_itemList[row].gsettingsName == "editionLicense") { ++ m_listView->setRowHidden(row, true); ++ } ++ }); ++ } + } + + DListView *SystemInfoWidget::getSystemListViewPointer() +-- +2.33.1 + diff --git a/dde-control-center.spec b/dde-control-center.spec index 5934fb4..93f7f38 100644 --- a/dde-control-center.spec +++ b/dde-control-center.spec @@ -1,12 +1,13 @@ Name: dde-control-center Version: 5.4.84.7 -Release: 2 +Release: 3 Summary: New control center for Linux Deepin License: GPLv3 URL: https://github.com/linuxdeepin/%{name} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz #add by uos Patch0001: 0001-dde-control-center-uos-fix-modify-eulerServerEnduserAgreement_new-path.patch +Patch0002: 0001-fix-Array-out-of-bounds-causes-crash-handling.patch #end BuildRequires: gcc-c++ @@ -54,6 +55,7 @@ Summary: %{summary} %prep %setup -q -n %{name}-%{version} %patch0001 -p1 +%patch0002 -p1 sed -i 's|lrelease|lrelease-qt5|' translate_generation.sh sed -i -E '/add_compile_definitions/d' CMakeLists.txt patch com.deepin.dde.control-center.gschema.xml < rpm/com.deepin.dde.control-center.gschema.xml.patch @@ -107,6 +109,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||: %{_libdir}/cmake/DdeControlCenter/ %changelog +* Thu Mar 21 2024 liweigang - 5.4.84.7-3 +- fix: Array out of bounds causes crash handling + * Mon Nov 27 2023 hanshuang - 5.4.84.7-2 - update package -- Gitee