From: Loïc Blot <nerzhul@users.noreply.github.com>
Date: Mon, 19 Jun 2017 12:10:30 +0000 (+0200)
Subject: Verify HudSetParams input when hotbar textures are set (#6013)
X-Git-Tag: 5.0.0~1091
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4dcc5985df4c94705ed7e4932a8b82a6e8c61f58;p=oweals%2Fminetest.git

Verify HudSetParams input when hotbar textures are set (#6013)

* Verify HudSetParams input when hotbar textures are set

This fix #6011
---

diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp
index 6d6486160..e6f0d7092 100644
--- a/src/network/clientpackethandler.cpp
+++ b/src/network/clientpackethandler.cpp
@@ -1174,9 +1174,21 @@ void Client::handleCommand_HudSetParam(NetworkPacket* pkt)
 			player->hud_hotbar_itemcount = hotbar_itemcount;
 	}
 	else if (param == HUD_PARAM_HOTBAR_IMAGE) {
+		// If value not empty verify image exists in texture source
+		if (value != "" && !getTextureSource()->isKnownSourceImage(value)) {
+			errorstream << "Server sent wrong Hud hotbar image (sent value: '"
+				<< value << "')" << std::endl;
+			return;
+		}
 		player->hotbar_image = value;
 	}
 	else if (param == HUD_PARAM_HOTBAR_SELECTED_IMAGE) {
+		// If value not empty verify image exists in texture source
+		if (value != "" && !getTextureSource()->isKnownSourceImage(value)) {
+			errorstream << "Server sent wrong Hud hotbar selected image (sent value: '"
+					<< value << "')" << std::endl;
+			return;
+		}
 		player->hotbar_selected_image = value;
 	}
 }