Client: Don't crash if trying to draw too many items from inventory in HUD

celeron55 · celeron55 · commit 8d315347100f · 2014-04-27T09:49:19.000+03:00
diff --git a/src/hud.cpp b/src/hud.cpp
@@ -127,7 +127,7 @@ void Hud::drawItem(v2s32 upperleftpos, s32 imgsize, s32 itemcount,
 			NULL, hbar_colors, true);
 	}
 
-	for (s32 i = 0; i < itemcount; i++)
+	for (s32 i = 0; i < itemcount && (size_t)i < mainlist->getSize(); i++)
 	{
 		const ItemStack &item = mainlist->getItem(i);
 

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ void Hud::drawItem(v2s32 upperleftpos, s32 imgsize, s32 itemcount,`
`127`	`127`	`NULL, hbar_colors, true);`
`128`	`128`	`}`
`129`	`129`
`130`		`- for (s32 i = 0; i < itemcount; i++)`
	`130`	`+ for (s32 i = 0; i < itemcount && (size_t)i < mainlist->getSize(); i++)`
`131`	`131`	`{`
`132`	`132`	`const ItemStack &item = mainlist->getItem(i);`
`133`	`133`