Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-09-30 03:08:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed SIOOBE when entering a blank quoted string

Browse Source
This commit is contained in:
zml2008 2011-12-24 22:04:37 -08:00
parent 9aa8c5f674
commit a1e239d08c
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/sk89q/minecraft/util/commands/CommandContext.java
View File

@ -64,7 +64,7 @@ public class CommandContext {
List<String> argList = new ArrayList<String>(args.length);
for (int i = 1; i < args.length; ++i) {
String arg = args[i];
if (arg.isEmpty()) {
if (arg.length() == 0) {
continue;
}
@ -94,6 +94,11 @@ public class CommandContext {
arg = build.toString();
i = endIndex;
}
// In case there is an empty quoted string
if (arg.length() == 0) {
continue;
}
// else raise exception about hanging quotes?
}
argList.add(arg);

4
src/main/java/com/sk89q/wepif/PermissionsResolverManager.java
View File

@ -241,8 +241,8 @@ public class PermissionsResolverManager implements PermissionsResolver {
}
if (keys.contains("dinner-perms") || keys.contains("dinnerperms")) {
config.setProperty("dinner-perms", null);
config.setProperty("dinnerperms", null);
config.removeProperty("dinner-perms");
config.removeProperty("dinnerperms");
isUpdated = true;
}
if (!keys.contains("permissions")) {

11
src/test/java/com/sk89q/minecraft/util/commands/CommandContextTest.java
View File

@ -143,4 +143,15 @@ public class CommandContextTest {
fail("Error creating CommandContext");
}
}
@Test
public void testEmptyQuote() {
try {
CommandContext context = new CommandContext("region flag xmas blocked-cmds \"\"");
assertEquals(context.argsLength(), 3);
} catch (CommandException e) {
e.printStackTrace();
fail("Error creating CommandContext");
}
}
}