From 90e7832408eb313676d40b747ec533c3b07e5c28 Mon Sep 17 00:00:00 2001
From: sapier <Sapier at GMX dot net>
Date: Tue, 12 Nov 2013 00:06:14 +0100
Subject: Fix invalid listname and listsize not handled correctly in set_size

---
 src/script/lua_api/l_inventory.cpp | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

(limited to 'src/script')

diff --git a/src/script/lua_api/l_inventory.cpp b/src/script/lua_api/l_inventory.cpp
index 67b78bcaf..d783cf60f 100644
--- a/src/script/lua_api/l_inventory.cpp
+++ b/src/script/lua_api/l_inventory.cpp
@@ -117,24 +117,38 @@ int InvRef::l_set_size(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	InvRef *ref = checkobject(L, 1);
 	const char *listname = luaL_checkstring(L, 2);
+
 	int newsize = luaL_checknumber(L, 3);
+	if (newsize < 0) {
+		lua_pushboolean(L, false);
+		return 1;
+	}
+
 	Inventory *inv = getinv(L, ref);
 	if(inv == NULL){
-		return 0;
+		lua_pushboolean(L, false);
+		return 1;
 	}
 	if(newsize == 0){
 		inv->deleteList(listname);
 		reportInventoryChange(L, ref);
-		return 0;
+		lua_pushboolean(L, true);
+		return 1;
 	}
 	InventoryList *list = inv->getList(listname);
 	if(list){
 		list->setSize(newsize);
 	} else {
 		list = inv->addList(listname, newsize);
+		if (!list)
+		{
+			lua_pushboolean(L, false);
+			return 1;
+		}
 	}
 	reportInventoryChange(L, ref);
-	return 0;
+	lua_pushboolean(L, true);
+	return 1;
 }
 
 // set_width(self, listname, size)
-- 
cgit v1.2.3