diff options
| author | Bernhard <34011017+Colfenor@users.noreply.github.com> | 2021-02-24 03:16:29 +0300 |
|---|---|---|
| committer | Jonathan White <support@dmapps.us> | 2021-02-26 22:24:41 +0300 |
| commit | 24977edf58ddcae82e16463554866d1453d1adde (patch) | |
| tree | f4d4afac4d9e9d74a19e9a11721e23d62a4214a2 | |
| parent | 34a78f0ec3a3c030218c71a57c6fa56e6cb0bc44 (diff) | |
KeeShare: Default to unsigned container unless specifically chosen
*Fix #6081 - Prevent assert and crash due to user entered data
| -rw-r--r-- | src/keeshare/ShareExport.cpp | 6 | ||||
| -rw-r--r-- | src/keeshare/ShareImport.cpp | 5 |
2 files changed, 2 insertions, 9 deletions
diff --git a/src/keeshare/ShareExport.cpp b/src/keeshare/ShareExport.cpp index c1797ac6d..aedbc04af 100644 --- a/src/keeshare/ShareExport.cpp +++ b/src/keeshare/ShareExport.cpp @@ -224,9 +224,5 @@ ShareObserver::Result ShareExport::intoContainer(const QString& resolvedPath, if (KeeShare::isContainerType(info, KeeShare::signedContainerFileType())) {
return intoSignedContainer(resolvedPath, reference, targetDb.data());
}
- if (KeeShare::isContainerType(info, KeeShare::unsignedContainerFileType())) {
- return intoUnsignedContainer(resolvedPath, reference, targetDb.data());
- }
- Q_ASSERT(false);
- return {reference.path, ShareObserver::Result::Error, tr("Unexpected export error occurred")};
+ return intoUnsignedContainer(resolvedPath, reference, targetDb.data());
}
diff --git a/src/keeshare/ShareImport.cpp b/src/keeshare/ShareImport.cpp index a767ab3aa..38a477aaf 100644 --- a/src/keeshare/ShareImport.cpp +++ b/src/keeshare/ShareImport.cpp @@ -344,8 +344,5 @@ ShareObserver::Result ShareImport::containerInto(const QString& resolvedPath, if (KeeShare::isContainerType(info, KeeShare::signedContainerFileType())) {
return signedContainerInto(resolvedPath, reference, targetGroup);
}
- if (KeeShare::isContainerType(info, KeeShare::unsignedContainerFileType())) {
- return unsignedContainerInto(resolvedPath, reference, targetGroup);
- }
- return {reference.path, ShareObserver::Result::Error, tr("Unknown share container type")};
+ return unsignedContainerInto(resolvedPath, reference, targetGroup);
}
|