do not allow invalid item codes

Brokkonaut · Feb 24, 2023 · 44401a5 · 44401a5
1 parent 1d7c0f1
commit 44401a5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/src/main/java/com/Acrobot/Breeze/Utils/MaterialUtil.java b/src/main/java/com/Acrobot/Breeze/Utils/MaterialUtil.java
@@ -99,7 +99,11 @@ public static String getName(Material material) {
     public static String getSignName(ItemStack itemStack) {
         String metaCode = "";
         if (itemStack.hasItemMeta()) {
-            metaCode = "#" + Metadata.getItemCode(itemStack);
+            metaCode = Metadata.getItemCode(itemStack);
+            if (metaCode == null) {
+                return null;
+            }
+            metaCode = "#" + metaCode;
         }
         return getSignMaterialName(itemStack.getType(), metaCode) + metaCode;
     }

diff --git a/src/main/java/com/Acrobot/ChestShop/Metadata/ItemDatabase.java b/src/main/java/com/Acrobot/ChestShop/Metadata/ItemDatabase.java
@@ -60,6 +60,12 @@ public String getItemCode(ItemStack item) {
                 return Base62.encode(itemEntity.getId());
             }
 
+            // different serialized data every time, encoding will not work
+            String codeCopy = encodeItemStack(decodeItemStack(code));
+            if (!codeCopy.equals(code)) {
+                return null;
+            }
+
             itemEntity = new Item(code);
 
             itemDao.create(itemEntity);

diff --git a/src/main/java/com/Acrobot/ChestShop/Signs/ChestShopSign.java b/src/main/java/com/Acrobot/ChestShop/Signs/ChestShopSign.java
@@ -103,6 +103,9 @@ public static String getCorrectedItemCode(String itemCode, Sign sign) {
                                             if (!MaterialUtil.isEmpty(shulkerContent)) {
                                                 item = shulkerContent;
                                                 itemCode = MaterialUtil.getSignName(shulkerContent);
+                                                if (itemCode == null) {
+                                                    item = null;
+                                                }
                                                 break out;
                                             }
                                         }
@@ -115,6 +118,9 @@ public static String getCorrectedItemCode(String itemCode, Sign sign) {
                             if (!MaterialUtil.isEmpty(stack)) {
                                 item = stack;
                                 itemCode = MaterialUtil.getSignName(stack);
+                                if (itemCode == null) {
+                                    item = null;
+                                }
                                 break;
                             }
                         }