Hello community, here is the log from the commit of package akregator for openSUSE:Factory checked in at 2017-07-12 19:31:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akregator (Old) and /work/SRC/openSUSE:Factory/.akregator.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akregator" Wed Jul 12 19:31:35 2017 rev:9 rq:508766 version:17.04.2 Changes: -------- --- /work/SRC/openSUSE:Factory/akregator/akregator.changes 2017-06-12 15:14:19.949577864 +0200 +++ /work/SRC/openSUSE:Factory/.akregator.new/akregator.changes 2017-07-12 19:31:36.245629636 +0200 @@ -1,0 +2,11 @@ +Thu Jul 6 19:53:26 UTC 2017 - [email protected] + +- Add fix-crash-if-no-current-frame.patch to fix another possible + crash (kde#381241) + +------------------------------------------------------------------- +Thu Jul 6 12:10:33 UTC 2017 - [email protected] + +- Add fix-crash.patch to fix a possible crash on start (kde#381416) + +------------------------------------------------------------------- New: ---- fix-crash-if-no-current-frame.patch fix-crash.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akregator.spec ++++++ --- /var/tmp/diff_new_pack.oFWpmL/_old 2017-07-12 19:31:37.209493642 +0200 +++ /var/tmp/diff_new_pack.oFWpmL/_new 2017-07-12 19:31:37.213493078 +0200 @@ -29,6 +29,10 @@ Group: Productivity/Networking/News/Utilities Url: http://www.kde.org Source0: %{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM fix-crash.patch kde#381416 -- fix a possible crash +Patch0: fix-crash.patch +# PATCH-FIX-UPSTREAM fix-crash-if-no-current-frame.patch kde#381241 -- fix another possible crash +Patch1: fix-crash-if-no-current-frame.patch BuildRequires: akonadi-mime-devel >= %{_kapp_version} BuildRequires: extra-cmake-modules >= %{kf5_version} BuildRequires: fdupes @@ -87,6 +91,8 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build %cmake_kf5 -d build -- -DBUILD_TESTING=OFF ++++++ fix-crash-if-no-current-frame.patch ++++++ >From 763739efa2e17ab1ed93fefe7b1070a86cad4532 Mon Sep 17 00:00:00 2001 From: Allen Winter <[email protected]> Date: Thu, 6 Jul 2017 12:22:55 -0400 Subject: frame/framemanager.cpp - crash guard if we don't have a current frame yet --- src/frame/framemanager.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/frame/framemanager.cpp b/src/frame/framemanager.cpp index d07c90f..f16b441 100644 --- a/src/frame/framemanager.cpp +++ b/src/frame/framemanager.cpp @@ -202,6 +202,10 @@ void FrameManager::slotSetStatusText(Frame *frame, const QString &statusText) void FrameManager::openUrl(OpenUrlRequest &request) { + if (!m_currentFrame) { + return; + } + if (request.browserArgs().newTab() || request.browserArgs().forcesNewWindow() || request.options() == OpenUrlRequest::NewTab || (m_currentFrame->id() == 0)) { int newFrameId = -1; Q_EMIT signalRequestNewFrame(newFrameId); -- cgit v0.11.2 ++++++ fix-crash.patch ++++++ >From 470801bd845ce6544018c7da9258d1e66ab662fa Mon Sep 17 00:00:00 2001 From: Allen Winter <[email protected]> Date: Wed, 5 Jul 2017 11:49:27 -0400 Subject: akregator_part.cpp - add a crash guard in case the mainWidget isn't set yet BUG: 38416 --- src/akregator_part.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/akregator_part.cpp b/src/akregator_part.cpp index 1932a1c..fb6d2b1 100644 --- a/src/akregator_part.cpp +++ b/src/akregator_part.cpp @@ -420,7 +420,9 @@ void Part::slotSetStatusText(const QString &statusText) void Part::saveSettings() { - m_mainWidget->saveSettings(); + if (m_mainWidget) { + m_mainWidget->saveSettings(); + } } Part::~Part() @@ -504,6 +506,10 @@ bool Part::writeToTextFile(const QString &data, const QString &filename) const void Part::feedListLoaded(const QSharedPointer<FeedList> &list) { Q_ASSERT(!m_standardListLoaded); + if (!m_mainWidget) { + return; + } + m_mainWidget->setFeedList(list); m_standardListLoaded = list != nullptr; @@ -522,6 +528,10 @@ void Part::feedListLoaded(const QSharedPointer<FeedList> &list) void Part::flushAddFeedRequests() { + if (!m_mainWidget) { + return; + } + for (const AddFeedRequest &i : qAsConst(m_requests)) { Q_FOREACH (const QString &j, i.urls) { m_mainWidget->addFeedToGroup(j, i.group); -- cgit v0.11.2
