fix: prevent NPE in CoinJoinExtension.addUnusedKey

dashpay · Nov 21, 2023 · 90193fa · 90193fa
1 parent 81d987c
commit 90193fa
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/core/src/main/java/org/bitcoinj/wallet/CoinJoinExtension.java b/core/src/main/java/org/bitcoinj/wallet/CoinJoinExtension.java
@@ -337,9 +337,13 @@ public void addUnusedKey(KeyId keyId) {
         unusedKeysLock.lock();
         try {
             DeterministicKey key = (DeterministicKey) findKeyFromPubKey(keyId.getBytes());
-            unusedKeys.put(KeyId.fromBytes(key.getPubKeyHash()), key);
-            keyUsage.put(key, false);
-            log.info("adding unused key: {} / {}", HEX.encode(key.getPubKeyHash()), key.getPath());
+            if (key != null) {
+                unusedKeys.put(KeyId.fromBytes(key.getPubKeyHash()), key);
+                keyUsage.put(key, false);
+                log.info("adding unused key: {} / {}", HEX.encode(key.getPubKeyHash()), key.getPath());
+            } else {
+                log.warn("cannot find {}", keyId);
+            }
         } finally {
             unusedKeysLock.unlock();
         }