Skip to content
Snippets Groups Projects
Commit 6e436a7c authored by dgelessus's avatar dgelessus
Browse files

Fix AIOOBE in CommandUtils.inspectArgs/completeArgs

parent dc92a2a8
No related branches found
No related tags found
No related merge requests found
......@@ -238,12 +238,15 @@ public final class CommandUtils {
int argStart = 0;
int argEnd = argString.length();
int i = 0;
while (argSplitMatcher.find() && i < inspectors.length) {
while (argSplitMatcher.find()) {
if (argSplitMatcher.end() > at) {
argEnd = argSplitMatcher.start();
break;
}
argStart = argSplitMatcher.end();
if (i >= inspectors.length-1) {
break;
}
i++;
}
return inspectors[i].inspect(argString.substring(argStart, argEnd), at - argStart);
......@@ -254,12 +257,15 @@ public final class CommandUtils {
int argStart = 0;
int argEnd = argString.length();
int i = 0;
while (argSplitMatcher.find() && i < completers.length) {
while (argSplitMatcher.find()) {
if (argSplitMatcher.end() > at) {
argEnd = argSplitMatcher.start();
break;
}
argStart = argSplitMatcher.end();
if (i >= completers.length-1) {
break;
}
i++;
}
final ReplacementOptions replacements = completers[i].complete(argString.substring(argStart, argEnd), at - argStart);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment