merged pull request mpetazzoni#60

JetBrains · Jun 27, 2018 · f76694d · f76694d
1 parent 0f9a379
commit f76694d
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/common/src/main/java/com/turn/ttorrent/common/protocol/http/HTTPAnnounceResponseMessage.java b/common/src/main/java/com/turn/ttorrent/common/protocol/http/HTTPAnnounceResponseMessage.java
@@ -93,6 +93,10 @@ public static HTTPAnnounceResponseMessage parse(BEValue decoded)
 
     Map<String, BEValue> params = decoded.getMap();
 
+    if (params.get("interval") == null) {
+      throw new MessageValidationException("Tracker message missing mandatory field 'interval'!");
+    }
+
     try {
       List<Peer> peers;
 
@@ -109,8 +113,8 @@ public static HTTPAnnounceResponseMessage parse(BEValue decoded)
       if (params.get("torrentIdentifier") != null) {
         return new HTTPAnnounceResponseMessage(Constants.EMPTY_BUFFER,
                 params.get("interval").getInt(),
-                params.get("complete").getInt(),
-                params.get("incomplete").getInt(),
+                params.get("complete") != null ? params.get("complete").getInt() : 0,
+                params.get("incomplete") != null ? params.get("incomplete").getInt() : 0,
                 peers, params.get("torrentIdentifier").getString());
       } else {
         return new HTTPAnnounceResponseMessage(Constants.EMPTY_BUFFER,