Hello community, here is the log from the commit of package kwallet for openSUSE:Factory checked in at 2016-10-10 17:35:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwallet (Old) and /work/SRC/openSUSE:Factory/.kwallet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwallet" Changes: -------- --- /work/SRC/openSUSE:Factory/kwallet/kwallet.changes 2016-09-14 23:28:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kwallet.new/kwallet.changes 2016-10-10 17:35:57.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Oct 6 14:48:04 UTC 2016 - wba...@tmo.at + +- Add fix-isOpen-crash-when-wallet-disabled.patch to fix a crash in + drkonqi (and maybe other applications) if kwallet is disabled + (kde#358260) + +------------------------------------------------------------------- New: ---- fix-isOpen-crash-when-wallet-disabled.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwallet.spec ++++++ --- /var/tmp/diff_new_pack.A25EM9/_old 2016-10-10 17:35:58.000000000 +0200 +++ /var/tmp/diff_new_pack.A25EM9/_new 2016-10-10 17:35:58.000000000 +0200 @@ -51,6 +51,8 @@ Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/kwallet-%{version}.tar.xz Source1: baselibs.conf +# PATCH-FIX-UPSTREAM fix-isOpen-crash-when-wallet-disabled.patch kde#358260 -- fix crash in drkonqi (and maybe other applications) if kwallet is disabled +Patch: fix-isOpen-crash-when-wallet-disabled.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -129,6 +131,7 @@ %lang_package -n kwalletd5 %prep %setup -q +%patch -p1 %build %cmake_kf5 -d build ++++++ fix-isOpen-crash-when-wallet-disabled.patch ++++++ From: Wolfgang Bauer <wba...@tmo.at> Date: Sat, 01 Oct 2016 09:43:23 +0000 Subject: Check whether kwallet is enabled in Wallet::isOpen(name) X-Git-Tag: v5.27.0-rc1 X-Git-Url: http://quickgit.kde.org/?p=kwallet.git&a=commitdiff&h=48ec969bcf36fde17de027576859c98bae609c73 --- Check whether kwallet is enabled in Wallet::isOpen(name) If kwallet is disabled, walletlauncher() fails to start the service and walletLauncher()->getInterface().isOpen(name) causes a crash. This affects e.g. drkonqi, but probably also other applications. Return false in this case, if kwallet is disabled a wallet cannot be open either. BUG: 358260 FIXED-IN: 5.27.0 REVIEW: 128831 --- --- a/src/api/KWallet/kwallet.cpp +++ b/src/api/KWallet/kwallet.cpp @@ -363,14 +363,16 @@ } } else { #endif - QDBusReply<bool> r = walletLauncher()->getInterface().isOpen(name); - - if (!r.isValid()) { - qDebug() << "Invalid DBus reply: " << r.error(); - return false; - } else { - return r; - } + if (walletLauncher()->m_walletEnabled) { + QDBusReply<bool> r = walletLauncher()->getInterface().isOpen(name); + + if (!r.isValid()) { + qDebug() << "Invalid DBus reply: " << r.error(); + return false; + } else { + return r; + } + } else return false; #if HAVE_KSECRETSSERVICE } #endif
