Protect against ItemStack crashes in ErrorUtil logging (#500)

mezz · Oct 5, 2016 · 225f10c · 225f10c
1 parent 2a28633
commit 225f10c
Showing 1 changed file with 17 additions and 7 deletions.
diff --git a/src/main/java/mezz/jei/util/ErrorUtil.java b/src/main/java/mezz/jei/util/ErrorUtil.java
@@ -149,15 +149,25 @@ public static List<String> getItemStackIngredientsInfo(@Nullable List list) {
 		for (Object ingredient : list) {
 			List<String> ingredientInfo = new ArrayList<String>();
 
-			List<ItemStack> stacks = stackHelper.toItemStackList(ingredient);
-			String oreDict = stackHelper.getOreDictEquivalent(stacks);
-			if (oreDict != null) {
-				ingredientInfo.add("OreDict: " + oreDict);
+			List<ItemStack> stacks = null;
+			try {
+				stacks = stackHelper.toItemStackList(ingredient);
+			} catch (RuntimeException ignored) {
+				ingredientInfo.add("too broken to get info");
+			} catch (LinkageError ignored) {
+				ingredientInfo.add("too broken to get info");
 			}
+
+			if (stacks != null) {
+				String oreDict = stackHelper.getOreDictEquivalent(stacks);
+				if (oreDict != null) {
+					ingredientInfo.add("OreDict: " + oreDict);
+				}
 
-			for (ItemStack stack : stacks) {
-				String itemStackInfo = getItemStackInfo(stack);
-				ingredientInfo.add(itemStackInfo);
+				for (ItemStack stack : stacks) {
+					String itemStackInfo = getItemStackInfo(stack);
+					ingredientInfo.add(itemStackInfo);
+				}
 			}
 
 			ingredientsInfo.add(ingredientInfo.toString() + "\n");