Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-27 13:06:02 +01:00
Code Issues Projects Releases Wiki Activity

Validate title for custom inventories. Fixes BUKKIT-4616, BUKKIT-4663

Browse Source 
Custom inventories currently do not validate the titles provided. Null values
cause NPEs when writing packets. Values longer than 32 characters
disconnect clients.

This change throws and IllegalArgumentException for null titles or titles
longer than 32 characters.
This commit is contained in:
Wesley Wolfe 2013-08-06 17:11:30 -05:00
parent 5e8dd7d57d
commit 066fcfe79f
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCustom.java
View File

@ -3,6 +3,7 @@ package org.bukkit.craftbukkit.inventory;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.commons.lang.Validate;
import org.bukkit.craftbukkit.entity.CraftHumanEntity; import org.bukkit.craftbukkit.entity.CraftHumanEntity;
import org.bukkit.entity.HumanEntity; import org.bukkit.entity.HumanEntity;
import org.bukkit.event.inventory.InventoryType; import org.bukkit.event.inventory.InventoryType;
@ -43,6 +44,8 @@ public class CraftInventoryCustom extends CraftInventory {
} }
public MinecraftInventory(InventoryHolder owner, int size, String title) { public MinecraftInventory(InventoryHolder owner, int size, String title) {
Validate.notNull(title, "Title cannot be null");
Validate.isTrue(title.length() <= 32, "Title cannot be longer than 32 characters");
this.items = new ItemStack[size]; this.items = new ItemStack[size];
this.title = title; this.title = title;
this.viewers = new ArrayList<HumanEntity>(); this.viewers = new ArrayList<HumanEntity>();