From 21f1725894c4bbb7f180fd97d4405181c634bfc1 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Sat, 8 Oct 2016 10:34:17 +0200 Subject: be more careful parsing integers in omemo --- src/main/java/de/pixart/messenger/parser/IqParser.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/main/java/de/pixart/messenger/parser') diff --git a/src/main/java/de/pixart/messenger/parser/IqParser.java b/src/main/java/de/pixart/messenger/parser/IqParser.java index 8e400680f..5617973d6 100644 --- a/src/main/java/de/pixart/messenger/parser/IqParser.java +++ b/src/main/java/de/pixart/messenger/parser/IqParser.java @@ -139,7 +139,11 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived { if(signedPreKeyPublic == null) { return null; } - return Integer.valueOf(signedPreKeyPublic.getAttribute("signedPreKeyId")); + try { + return Integer.valueOf(signedPreKeyPublic.getAttribute("signedPreKeyId")); + } catch (NumberFormatException e) { + return null; + } } public ECPublicKey signedPreKeyPublic(final Element bundle) { @@ -255,7 +259,7 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived { Integer signedPreKeyId = signedPreKeyId(bundleElement); byte[] signedPreKeySignature = signedPreKeySignature(bundleElement); IdentityKey identityKey = identityKey(bundleElement); - if(signedPreKeyPublic == null || identityKey == null) { + if(signedPreKeyId == null || signedPreKeyPublic == null || identityKey == null) { return null; } -- cgit v1.2.3