backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-25 19:03:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use standard colour table lengths in texture packs

Browse source
This commit is contained in:
notmatthewbeshay 2026-03-11 03:24:51 +11:00
parent 9c9fff7366
commit 4b5ca6d496
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Minecraft.Client/Textures/Packs/AbstractTexturePack.cpp
View file

@ -4,6 +4,8 @@
#include "../../../Minecraft.World/IO/Streams/InputOutputStream.h"
#include "../../../Minecraft.World/Util/StringHelpers.h"
#include <limits>
AbstractTexturePack::AbstractTexturePack(std::uint32_t id, File *file, const std::wstring &name, TexturePack *fallback) : id(id), name(name)
{
// 4J init
@ -257,14 +259,22 @@ void AbstractTexturePack::loadDefaultColourTable()
if(coloursFile.exists())
{
DWORD dwLength = coloursFile.length();
byteArray data(dwLength);
const __int64 colourTableLength = coloursFile.length();
if(colourTableLength < 0 || colourTableLength > static_cast<__int64>(std::numeric_limits<unsigned int>::max()))
{
app.DebugPrintf("Failed to load the default colours table\n");
app.FatalLoadError();
return;
}
const unsigned int dataLength = static_cast<unsigned int>(colourTableLength);
byteArray data(dataLength);
FileInputStream fis(coloursFile);
fis.read(data,0,dwLength);
fis.read(data,0,dataLength);
fis.close();
if(m_colourTable != NULL) delete m_colourTable;
m_colourTable = new ColourTable(data.data, dwLength);
m_colourTable = new ColourTable(data.data, dataLength);
delete [] data.data;
}