fix npe validating pub key

haveno-dex · Aug 18, 2022 · 857a1d0 · 857a1d0
1 parent f869aec
commit 857a1d0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java b/core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java
@@ -588,7 +588,7 @@ private boolean isPubKeyValid(DecryptedMessageWithPubKey message, NodeAddress se
         if (trade.getArbitratorPubKeyRing() != null && message.getSignaturePubKey().equals(trade.getArbitratorPubKeyRing().getSignaturePubKey())) return true;
 
         // not invalid if pub key rings are unknown
-        if (trade.getTradingPeer().getPubKeyRing() == null && trade.getArbitratorPubKeyRing() == null) return true;
+        if ((trade.getTradingPeer() == null || trade.getTradingPeer().getPubKeyRing() == null) && trade.getArbitratorPubKeyRing() == null) return true;
 
         // valid if peer's pub key ring
         if (trade.getTradingPeer() != null && trade.getTradingPeer().getPubKeyRing() != null && message.getSignaturePubKey().equals(trade.getTradingPeer().getPubKeyRing().getSignaturePubKey())) return true;