From 878af163a9c6abe92586aa6140c54468d72e9273 Mon Sep 17 00:00:00 2001
From: jrandom <jrandom>
Date: Sun, 13 Jun 2004 19:32:58 +0000
Subject: [PATCH] handle null boolean value (legal, but not in this context),
 fixes bug reported by nickster

---
 router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java b/router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java
index b1a57e9da..c1ffa6c74 100644
--- a/router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java
+++ b/router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java
@@ -84,7 +84,10 @@ public class DatabaseLookupMessage extends I2NPMessageImpl {
             _key.readBytes(in);
             _from = new RouterInfo();
             _from.readBytes(in);
-            boolean tunnelSpecified = DataHelper.readBoolean(in).booleanValue();
+            Boolean val = DataHelper.readBoolean(in);
+            if (val == null) 
+                throw new I2NPMessageException("Tunnel must be explicitly specified (or not)");
+            boolean tunnelSpecified = val.booleanValue();
             if (tunnelSpecified) {
                 _replyTunnel = new TunnelId();
                 _replyTunnel.readBytes(in);