From 82cb40e9bf0614bd3483b83bb736db6e96d12def Mon Sep 17 00:00:00 2001
From: HungryHobo <HungryHobo@mail.i2p>
Date: Wed, 16 Mar 2011 19:11:27 +0000
Subject: [PATCH] Check for null values from I2PSession.receiveMessage()

---
 src/i2p/bote/network/I2PPacketDispatcher.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/i2p/bote/network/I2PPacketDispatcher.java b/src/i2p/bote/network/I2PPacketDispatcher.java
index 07384c76..73cd76c0 100644
--- a/src/i2p/bote/network/I2PPacketDispatcher.java
+++ b/src/i2p/bote/network/I2PPacketDispatcher.java
@@ -114,6 +114,11 @@ public class I2PPacketDispatcher extends I2PBoteThread implements I2PSessionMuxe
         } catch (I2PSessionException e) {
             log.error("Can't get new message from I2PSession.", e);
         }
+        if (msg == null) {
+            log.error("I2PSession returned a null message: msgId=" + msgId + ", size=" + size + ", " + session);
+            return;
+        }
+        
         I2PDatagramDissector datagramDissector = new I2PDatagramDissector();
         try {
             datagramDissector.loadI2PDatagram(msg);