R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

RTech: fix bug when trying to print fourcc as string

Browse Source 
The printf specifier does not allow limiting buffer reads. Made the FourCCToString more performant by using a fixed size stack array and creating the fourcc into that which we now use to properly print out the asset magic.
This commit is contained in:
Kawe Mazidjatari 2024-01-28 19:07:04 +01:00
parent 082a8e4ef7
commit 4d74dc5052
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
r5dev/common/callback.cpp
View File

@ -340,7 +340,10 @@ void Pak_ListTypes_f(const CCommand& args)
if (!type->description)
continue;
Msg(eDLL_T::RTECH, "| %-4s | %-25s | %7i | %11i | %11i |\n", FourCCToString(type->extension).c_str(), type->description, type->version, type->headerSize, type->nativeClassSize);
FourCCString_t assetExtension;
FourCCToString(assetExtension, type->extension);
Msg(eDLL_T::RTECH, "| %-4s | %-25s | %7i | %11i | %11i |\n", assetExtension, type->description, type->version, type->headerSize, type->nativeClassSize);
nRegistered++;
}
Msg(eDLL_T::RTECH, "|------|---------------------------|---------|-------------|-------------|\n");

3
r5dev/public/tier0/utility.h
View File

@ -64,7 +64,8 @@ string& StringLTrim(string& svInput, const char* pszToTrim, bool bTrimBefore = f
string& StringRTrim(string& svInput, const char* pszToTrim, bool bTrimAfter = false);
string& StringTrim(string& svInput, const char* pszToTrim, bool bTrimAll = false);
string FourCCToString(int n);
typedef char FourCCString_t[5];
void FourCCToString(FourCCString_t& buf, const int n);
/////////////////////////////////////////////////////////////////////////////
// Bytes

7
r5dev/rtech/pak/pakparse.cpp
View File

@ -848,10 +848,13 @@ void Pak_StubInvalidAssetBinds(PakFile_t* const pak, PakSegmentDescriptor_t* con
// which isn't much help to the average user that can't rebuild other people's paks
if (asset->version != assetBinding->version)
{
FourCCString_t assetMagic;
FourCCToString(assetMagic, asset->magic);
DevWarning(eDLL_T::RTECH,
"Unexpected asset version for \"%s\" (%.4s) asset with guid 0x%llX (asset %i in pakfile '%s'). Expected %i, found %i.\n",
"Unexpected asset version for \"%s\" (%.4s) asset with guid 0x%llX (asset %u in pakfile '%s'). Expected %u, found %u.\n",
assetBinding->description,
reinterpret_cast<char*>(&asset->magic),
assetMagic,
asset->guid,
i, pak->GetName(),
assetBinding->version, asset->version

13
r5dev/tier0/utility.cpp
View File

@ -918,14 +918,13 @@ pair<vector<uint8_t>, string> StringToMaskedBytes(const char* szInput, bool bNul
///////////////////////////////////////////////////////////////////////////////
// For converting a 32-bit integer into a 4-char ascii string
string FourCCToString(int n)
void FourCCToString(FourCCString_t& buf, const int n)
{
stringstream ss;
ss << (char)((n & 0x000000ff) >> 0);
ss << (char)((n & 0x0000ff00) >> 8);
ss << (char)((n & 0x00ff0000) >> 16);
ss << (char)((n & 0xff000000) >> 24);
return ss.str();
buf[0] = (char)((n & 0x000000ff) >> 0);
buf[1] = (char)((n & 0x0000ff00) >> 8);
buf[2] = (char)((n & 0x00ff0000) >> 16);
buf[3] = (char)((n & 0xff000000) >> 24);
buf[4] = '\0';
};
///////////////////////////////////////////////////////////////////////////////