From ffea551afc95ec68892ca9003f99c383c7cc5661 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Mon, 16 Jun 2014 22:32:17 +0200
Subject: drop invalid user ids and add fatal case(s)

---
 .../java/org/sufficientlysecure/keychain/provider/ProviderHelper.java  | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider')

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();
 
-- 
cgit v1.2.3