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

* Verify HudSetParams input when hotbar textures are set This fix #6011
minetest · Jun 19, 2017 · 4dcc598 · 4dcc598
1 parent 0c429bd
commit 4dcc598
Showing 1 changed file with 12 additions and 0 deletions.
diff --git 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;
 	}
 }