diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-16 22:32:17 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-16 22:32:17 +0200 |
commit | ffea551afc95ec68892ca9003f99c383c7cc5661 (patch) | |
tree | 900a8abd5671316e529fe27e5d5ff976436b8120 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java | |
parent | 2f0e70587dfc21ce5c3d826f3d96b8231674f022 (diff) | |
download | open-keychain-ffea551afc95ec68892ca9003f99c383c7cc5661.tar.gz open-keychain-ffea551afc95ec68892ca9003f99c383c7cc5661.tar.bz2 open-keychain-ffea551afc95ec68892ca9003f99c383c7cc5661.zip |
drop invalid user ids and add fatal case(s)
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java index 497957e5e..80fabdf48 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java @@ -298,6 +298,9 @@ public class ProviderHelper { // Canonicalize this key, to assert a number of assumptions made about it. keyRing = keyRing.canonicalize(mLog, mIndent); + if (keyRing == null) { + return new SaveKeyringResult(SaveKeyringResult.RESULT_ERROR, mLog); + } UncachedPublicKey masterKey = keyRing.getPublicKey(); |