Make GUIinventoryMenu::drawList more robust with invalid data

diff --git a/src/guiInventoryMenu.cpp b/src/guiInventoryMenu.cpp
index 51001eee3c3657737b88eafc08a686e358535e11..e637ab78ae7136ffddb14d5662ad0fe77715aacb 100644 (file)
--- a/src/guiInventoryMenu.cpp
+++ b/src/guiInventoryMenu.cpp
@@ -284,8 +284,21 @@ void GUIInventoryMenu::drawList(const ListDrawSpec &s, int phase)
                font = skin->getFont();
        
        Inventory *inv = m_invmgr->getInventory(s.inventoryloc);
-       assert(inv);
+       if(!inv){
+               infostream<<"GUIInventoryMenu::drawList(): WARNING: "
+                               <<"The inventory location "
+                               <<"\""<<s.inventoryloc.dump()<<"\" doesn't exist"
+                               <<std::endl;
+               return;
+       }
        InventoryList *ilist = inv->getList(s.listname);
+       if(!ilist){
+               infostream<<"GUIInventoryMenu::drawList(): WARNING: "
+                               <<"The inventory list \""<<s.listname<<"\" @ \""
+                               <<s.inventoryloc.dump()<<"\" doesn't exist"
+                               <<std::endl;
+               return;
+       }
        
        core::rect<s32> imgrect(0,0,imgsize.X,imgsize.Y);