Fix #2253: crash when accessing out-of-range attack from Lua

wesnoth · Nov 30, 2017 · 6cd2a9b · 6cd2a9b
1 parent dcd93bb
commit 6cd2a9b
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/scripting/lua_unit_attacks.cpp b/src/scripting/lua_unit_attacks.cpp
@@ -49,14 +49,22 @@ void push_unit_attacks_table(lua_State* L, int idx)
 
 void luaW_pushweapon(lua_State* L, attack_ptr weapon)
 {
-	new(L) attack_ref(weapon);
-	luaL_setmetatable(L, uattackKey);
+	if(weapon != nullptr) {
+		new(L) attack_ref(weapon);
+		luaL_setmetatable(L, uattackKey);
+	} else {
+		lua_pushnil(L);
+	}
 }
 
 void luaW_pushweapon(lua_State* L, const_attack_ptr weapon)
 {
-	new(L) attack_ref(weapon);
-	luaL_setmetatable(L, uattackKey);
+	if(weapon != nullptr) {
+		new(L) attack_ref(weapon);
+		luaL_setmetatable(L, uattackKey);
+	} else {
+		lua_pushnil(L);
+	}
 }
 
 static attack_ref& luaW_checkweapon_ref(lua_State* L, int idx)