echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NetDb: Fix NPE on store of Encrypted LS (ticket #2563)

Browse Source
This commit is contained in:
zzz
2019-07-09 18:31:37 +00:00
parent 7a64505139
commit 685088ccca
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
View File

@ -944,8 +944,12 @@ public abstract class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacad
// spoof / hash collision detection // spoof / hash collision detection
// todo allow non-exp to overwrite exp // todo allow non-exp to overwrite exp
if (rv != null && !leaseSet.getDestination().equals(rv.getDestination())) if (rv != null) {
throw new IllegalArgumentException("LS Hash collision"); Destination d1 = leaseSet.getDestination();
Destination d2 = rv.getDestination();
if (d1 != null && d2 != null && !d1.equals(d2))
throw new IllegalArgumentException("LS Hash collision");
}
EncryptedLeaseSet encls = null; EncryptedLeaseSet encls = null;
if (leaseSet.getType() == DatabaseEntry.KEY_TYPE_ENCRYPTED_LS2) { if (leaseSet.getType() == DatabaseEntry.KEY_TYPE_ENCRYPTED_LS2) {