Fix NPEs

sfPlayer1 · Nov 25, 2022 · 422ff03 · 422ff03
1 parent d3dd8ad
commit 422ff03
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/matcher/PluginLoader.java b/src/matcher/PluginLoader.java
@@ -23,7 +23,7 @@ public static void run(String[] args) {
 		for (int i = 0; i < args.length; i++) {
 			switch (args[i]) {
 			case "--additional-plugins":
-				while (!args[i+1].startsWith("--")) {
+				while (i+1 < args.length && !args[i+1].startsWith("--")) {
 					pluginPaths.add(Path.of(args[++i]));
 				}
 

diff --git a/src/matcher/gui/Gui.java b/src/matcher/gui/Gui.java
@@ -135,35 +135,35 @@ private void handleStartupArgs(List<String> args) {
 			// ProjectConfig args
 
 			case "--inputs-a":
-				while (!args.get(i+1).startsWith("--")) {
+				while (i+1 < args.size() && !args.get(i+1).startsWith("--")) {
 					inputsA.add(Path.of(args.get(++i)));
 					validProjectConfigArgPresent = true;
 				}
 
 				break;
 			case "--inputs-b":
-				while (!args.get(i+1).startsWith("--")) {
+				while (i+1 < args.size() && !args.get(i+1).startsWith("--")) {
 					inputsB.add(Path.of(args.get(++i)));
 					validProjectConfigArgPresent = true;
 				}
 
 				break;
 			case "--classpath-a":
-				while (!args.get(i+1).startsWith("--")) {
+				while (i+1 < args.size() && !args.get(i+1).startsWith("--")) {
 					classPathA.add(Path.of(args.get(++i)));
 					validProjectConfigArgPresent = true;
 				}
 
 				break;
 			case "--classpath-b":
-				while (!args.get(i+1).startsWith("--")) {
+				while (i+1 < args.size() && !args.get(i+1).startsWith("--")) {
 					classPathB.add(Path.of(args.get(++i)));
 					validProjectConfigArgPresent = true;
 				}
 
 				break;
 			case "--shared-classpath":
-				while (!args.get(i+1).startsWith("--")) {
+				while (i+1 < args.size() && !args.get(i+1).startsWith("--")) {
 					sharedClassPath.add(Path.of(args.get(++i)));
 					validProjectConfigArgPresent = true;
 				}