OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-22 08:15:05 +01:00
Code Issues Projects Releases Packages Wiki Activity

Enforce proper limits on books.

Browse source
This commit is contained in:
md_5 2017-04-20 21:45:42 +10:00
parent be9ef980b9
commit 4acd0f49e0
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
View file

@ -29,8 +29,9 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
static final ItemMetaKey BOOK_PAGES = new ItemMetaKey("pages"); static final ItemMetaKey BOOK_PAGES = new ItemMetaKey("pages");
static final ItemMetaKey RESOLVED = new ItemMetaKey("resolved"); static final ItemMetaKey RESOLVED = new ItemMetaKey("resolved");
static final ItemMetaKey GENERATION = new ItemMetaKey("generation"); static final ItemMetaKey GENERATION = new ItemMetaKey("generation");
static final int MAX_PAGE_LENGTH = Short.MAX_VALUE; // TODO: Check me static final int MAX_PAGES = 50;
static final int MAX_TITLE_LENGTH = 0xffff; static final int MAX_PAGE_LENGTH = 256;
static final int MAX_TITLE_LENGTH = 16;
protected String title; protected String title;
protected String author; protected String author;
@ -68,7 +69,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
if (tag.hasKey(RESOLVED.NBT)) { if (tag.hasKey(RESOLVED.NBT)) {
resolved = tag.getBoolean(RESOLVED.NBT); resolved = tag.getBoolean(RESOLVED.NBT);
} }
if (tag.hasKey(GENERATION.NBT)) { if (tag.hasKey(GENERATION.NBT)) {
generation = tag.getInt(GENERATION.NBT); generation = tag.getInt(GENERATION.NBT);
} }
@ -106,7 +107,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
} }
} }
} }
generation = SerializableMeta.getObject(Integer.class, map, GENERATION.BUKKIT, true); generation = SerializableMeta.getObject(Integer.class, map, GENERATION.BUKKIT, true);
} }
@ -235,6 +236,10 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
public void addPage(final String... pages) { public void addPage(final String... pages) {
for (String page : pages) { for (String page : pages) {
if (this.pages.size() >= MAX_PAGES) {
return;
}
if (page == null) { if (page == null) {
page = ""; page = "";
} else if (page.length() > MAX_PAGE_LENGTH) { } else if (page.length() > MAX_PAGE_LENGTH) {
@ -342,7 +347,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
} }
builder.put(BOOK_PAGES.BUKKIT, pagesString); builder.put(BOOK_PAGES.BUKKIT, pagesString);
} }
if (generation != null) { if (generation != null) {
builder.put(GENERATION.BUKKIT, generation); builder.put(GENERATION.BUKKIT, generation);
} }