Add some range checking.

Change-Id: I907f185d82fb4f7273eb5341acd100815688c4f2
Fixes-issue: CLIENT-406
Reviewed-on: http://gerrit.dmdirc.com/2813
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

src/com/dmdirc/parser/irc/Process004005.java

@@ -123,21 +123,27 @@ public class Process004005 extends IRCProcessor {
         int i = multiParam ? 4 : 1;
         final String[] bits = multiParam ? token : token[3].split(" ");
 
-        parser.h005Info.put("004IRCD", bits[i++]);
+        if (bits.length > i) {
+            parser.h005Info.put("004IRCD", bits[i]);
+            i++;
+        }
 
-        if (bits[i].matches("^\\d+$")) {
+        if (bits.length > i && bits[i].matches("^\\d+$")) {
             // some IRCDs put a timestamp where the usermodes should be
             // (issues 4140. 4181 and 4183) so check to see if this is
             // numeric only, and if so, skip it.
             i++;
         }
 
-        parser.h005Info.put("USERMODES", bits[i++]);
-        parser.h005Info.put("USERCHANMODES", bits[i++]);
+        if (bits.length > i + 1) {
+            parser.h005Info.put("USERMODES", bits[i]);
+            parser.h005Info.put("USERCHANMODES", bits[i + 1]);
+            i += 2;
+        }
 
         if (bits.length > i) {
             // INSPIRCD includes an extra param
-            parser.h005Info.put("USERCHANPARAMMODES", bits[i++]);
+            parser.h005Info.put("USERCHANPARAMMODES", bits[i]);
         }
 
         parser.parseUserModes();

test/com/dmdirc/parser/irc/Process004005Test.java

@@ -22,11 +22,14 @@
 
 package com.dmdirc.parser.irc;
 
-import com.dmdirc.parser.common.ParserError;
 import com.dmdirc.harness.parser.TestParser;
+import com.dmdirc.parser.common.ParserError;
 import com.dmdirc.parser.interfaces.callbacks.ErrorInfoListener;
+
 import java.util.Date;
+
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;