From 8f37b22adbedc7c261bb2f274add93a0c42c76e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 29 Aug 2014 18:39:15 +0200
Subject: Fix possible nullpointer in Preferences

---
 .../main/java/org/sufficientlysecure/keychain/helper/Preferences.java  | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
index 5190a550e..0415baf64 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
@@ -215,6 +215,9 @@ public class Preferences {
             ListIterator<String> it = servers.listIterator();
             while (it.hasNext()) {
                 String server = it.next();
+                if (server == null) {
+                    continue;
+                }
                 if (server.equals("pool.sks-keyservers.net")) {
                     // use HKPS!
                     it.set("hkps://hkps.pool.sks-keyservers.net");
-- 
cgit v1.2.3