From 0e029f84b062850309f64ba9fc8dc6cc9c67cf3e Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sun, 3 Feb 2019 19:03:28 +0000
Subject: [PATCH] I2CP: Fix LS2 NPE

---
 .../src/net/i2p/router/client/ClientMessageEventListener.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/router/java/src/net/i2p/router/client/ClientMessageEventListener.java b/router/java/src/net/i2p/router/client/ClientMessageEventListener.java
index 28d927921e..c8731c6c3c 100644
--- a/router/java/src/net/i2p/router/client/ClientMessageEventListener.java
+++ b/router/java/src/net/i2p/router/client/ClientMessageEventListener.java
@@ -563,7 +563,8 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi
                 }
                 // just register new SPK, don't verify, unused
                 _context.keyManager().registerKeys(dest, message.getSigningPrivateKey(), message.getPrivateKey());
-            } else if (!message.getSigningPrivateKey().equals(keys.getRevocationKey())) {
+            } else if (message.getSigningPrivateKey() != null &&
+                       !message.getSigningPrivateKey().equals(keys.getRevocationKey())) {
                 // just register new SPK, don't verify, unused
                 _context.keyManager().registerKeys(dest, message.getSigningPrivateKey(), message.getPrivateKey());
             }
-- 
GitLab