diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-28 17:04:25 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-28 17:09:56 +0200 |
| commit | da131220aac727865b9e33e8d34743939e8acbf0 (patch) | |
| tree | 2ea9362119ff8bec0f832916c2f589b66c653cfd /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java | |
| parent | cce243299a400e9d68b9bd350fd75870f51b732f (diff) | |
| download | open-keychain-da131220aac727865b9e33e8d34743939e8acbf0.tar.gz open-keychain-da131220aac727865b9e33e8d34743939e8acbf0.tar.bz2 open-keychain-da131220aac727865b9e33e8d34743939e8acbf0.zip | |
watch out for nullpointers from get(Un|)HashedSubpackets
fixes #721
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java index 8838075cd..de8c683ff 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java @@ -513,7 +513,8 @@ public class UncachedKeyRing { } // if this certificate says it allows signing for the key - if (zert.getHashedSubPackets().hasSubpacket(SignatureSubpacketTags.KEY_FLAGS)) { + if (zert.getHashedSubPackets() != null && + zert.getHashedSubPackets().hasSubpacket(SignatureSubpacketTags.KEY_FLAGS)) { int flags = ((KeyFlags) zert.getHashedSubPackets() .getSubpacket(SignatureSubpacketTags.KEY_FLAGS)).getFlags(); |