aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-08-29 18:39:15 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-08-29 18:39:15 +0200
commit8f37b22adbedc7c261bb2f274add93a0c42c76e0 (patch)
tree78ca076163403098354a36efc2cdf3d8d4e07994 /OpenKeychain/src/main/java
parent880aea53c9b2fbc953ba0a57a34c9ae091fe2954 (diff)
downloadopen-keychain-8f37b22adbedc7c261bb2f274add93a0c42c76e0.tar.gz
open-keychain-8f37b22adbedc7c261bb2f274add93a0c42c76e0.tar.bz2
open-keychain-8f37b22adbedc7c261bb2f274add93a0c42c76e0.zip
Fix possible nullpointer in Preferences
Diffstat (limited to 'OpenKeychain/src/main/java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java3
1 files changed, 3 insertions, 0 deletions
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");