diff options
author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-02 18:08:58 +0000 |
---|---|---|
committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-02 18:08:58 +0000 |
commit | 4aa7cd02d3a11034316d4a878a493e2507d26797 (patch) | |
tree | 14c250adf4d8ee51b1e4418e6cfdec11d01e3643 /user/kpmcore/nullptr-segfault.patch | |
parent | 98c3f05e07b419212d0f6ba49da7ff81fd62aa58 (diff) | |
download | packages-4aa7cd02d3a11034316d4a878a493e2507d26797.tar.gz packages-4aa7cd02d3a11034316d4a878a493e2507d26797.tar.bz2 packages-4aa7cd02d3a11034316d4a878a493e2507d26797.tar.xz packages-4aa7cd02d3a11034316d4a878a493e2507d26797.zip |
user/kpmcore: Bump to 4.0.1, fix issues
* FAT32 partitions were using the exFAT MBR code.
* Use-before-init when closing partitionmanager sometimes.
* Remove broken test.
Diffstat (limited to 'user/kpmcore/nullptr-segfault.patch')
-rw-r--r-- | user/kpmcore/nullptr-segfault.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/user/kpmcore/nullptr-segfault.patch b/user/kpmcore/nullptr-segfault.patch new file mode 100644 index 000000000..3caeecbdf --- /dev/null +++ b/user/kpmcore/nullptr-segfault.patch @@ -0,0 +1,35 @@ +From c02d59aa6d314678cef9683f96b28e2a1abd82b7 Mon Sep 17 00:00:00 2001 +From: Hartmut Goebel <h.goebel@crazy-compilers.com> +Date: Thu, 7 Nov 2019 22:16:36 +0000 +Subject: Stop helper only if formerly started. + +Differential Revision: https://phabricator.kde.org/D25161 +BUG: 413851 +--- + src/util/externalcommand.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/util/externalcommand.cpp b/src/util/externalcommand.cpp +index 30b98a2..6f45127 100644 +--- a/src/util/externalcommand.cpp ++++ b/src/util/externalcommand.cpp +@@ -433,6 +433,8 @@ bool ExternalCommand::startHelper() + + void ExternalCommand::stopHelper() + { ++ if (!helperStarted) ++ return; + auto *interface = new org::kde::kpmcore::externalcommand(QStringLiteral("org.kde.kpmcore.externalcommand"), + QStringLiteral("/Helper"), QDBusConnection::systemBus()); + QByteArray request; +@@ -441,6 +443,7 @@ void ExternalCommand::stopHelper() + QByteArray hash = QCryptographicHash::hash(request, QCryptographicHash::Sha512); + interface->exit(privateKey->signMessage(hash, QCA::EMSA3_Raw), nonce); + ++ helperStarted = false; + delete privateKey; + delete init; + } +-- +cgit v1.1 + |