Hello community,
here is the log from the commit of package plasma-framework for
openSUSE:Factory checked in at 2020-01-06 16:01:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plasma-framework (Old)
and /work/SRC/openSUSE:Factory/.plasma-framework.new.6675 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma-framework"
Mon Jan 6 16:01:56 2020 rev:83 rq:760440 version:5.65.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/plasma-framework/plasma-framework.changes
2019-12-18 14:44:47.509841834 +0100
+++
/work/SRC/openSUSE:Factory/.plasma-framework.new.6675/plasma-framework.changes
2020-01-06 16:01:57.353718561 +0100
@@ -1,0 +2,6 @@
+Mon Dec 30 07:16:20 UTC 2019 - Wolfgang Bauer <[email protected]>
+
+- Add calendar-Check-out-of-bounds-array-access.patch to fix a
+ possible crash with a "broken" locale setup (boo#1159871)
+
+-------------------------------------------------------------------
New:
----
calendar-Check-out-of-bounds-array-access.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plasma-framework.spec ++++++
--- /var/tmp/diff_new_pack.KYKLZf/_old 2020-01-06 16:01:57.901718846 +0100
+++ /var/tmp/diff_new_pack.KYKLZf/_new 2020-01-06 16:01:57.909718851 +0100
@@ -36,6 +36,8 @@
Source2: frameworks.keyring
%endif
Source99: baselibs.conf
+# PATCH-FIX-UPSTREAM
+Patch0: calendar-Check-out-of-bounds-array-access.patch
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
BuildRequires: fdupes
BuildRequires: kf5-filesystem
@@ -133,6 +135,7 @@
%prep
%setup -q
+%autopatch -p1
%build
%cmake_kf5 -d build
++++++ calendar-Check-out-of-bounds-array-access.patch ++++++
>From 6756d00fba11ca2af921a67acdb5e3c92e23bb8a Mon Sep 17 00:00:00 2001
From: David Edmundson <[email protected]>
Date: Wed, 18 Dec 2019 12:52:15 +0000
Subject: [calendar] Check out of bounds array access in QLocale lookup
Summary:
If we have a broken locale setup we don't have any uiLanugages to look
up the relevant locale object for.
In that case use the system locale.
Test Plan:
Had a crash here
#11 0x00007ff982aab0b2 in QList<QString>::at(int) const (this=0x7ffd50b1d928,
i=0) at /opt/qt5/include/QtCore/qlist.h:571
#12 0x00007ff982aaaa4a in Calendar::monthName() const (this=0x5640cce026f0) at
/home/david/projects/kde5/src/frameworks/plasma-framework/src/declarativeimports/calendar/calendar.cpp:202
#13 0x00007ff982aa14e9 in Calendar::qt_static_metacall(QObject*,
QMetaObject::Call, int, void**) (_o=0x5640cce026f0,
_c=QMetaObject::ReadProperty, _id=9, _a=0x7ffd50b1dd40) at
src/declarativeimports/calendar/calendarplugin_autogen/EWIEGA46WW/moc_calendar.cpp:340
Reviewers: #plasma, vkrause
Reviewed By: vkrause
Subscribers: kde-frameworks-devel
Tags: #frameworks
Differential Revision: https://phabricator.kde.org/D25960
---
src/declarativeimports/calendar/calendar.cpp | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/declarativeimports/calendar/calendar.cpp
b/src/declarativeimports/calendar/calendar.cpp
index f652c65..c77824d 100644
--- a/src/declarativeimports/calendar/calendar.cpp
+++ b/src/declarativeimports/calendar/calendar.cpp
@@ -199,9 +199,12 @@ QString Calendar::monthName() const
// locale and take the month name from that.
//
// See https://bugs.kde.org/show_bug.cgi?id=353715
- const QString lang = QLocale().uiLanguages().at(0);
- // If lang is empty, it will create just a system locale
- QLocale langLocale(lang);
+
+ QLocale langLocale;
+
+ if (QLocale().uiLanguages().length() > 0) {
+ langLocale = QLocale(QLocale().uiLanguages().at(0));
+ }
return langLocale.standaloneMonthName(m_displayedDate.month());
}
--
cgit v1.1
