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

VpkLib: fix bug in GetManifest()

Browse Source 
Check if the parsing was actually successful, else free and return nullptr. The null check at call site never worked since we never return null on failure.
This commit is contained in:
Kawe Mazidjatari 2024-01-13 23:56:47 +01:00
parent 5f554867a1
commit 465d905056
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
r5dev/vpklib/packedstore.cpp
View File

@ -189,7 +189,11 @@ static KeyValues* GetManifest(const CUtlString& workspacePath, const CUtlString&
outPath.Format("%s%s%s.txt", workspacePath.Get(), "manifest/", manifestFile.Get());
KeyValues* pManifestKV = new KeyValues("BuildManifest");
pManifestKV->LoadFromFile(FileSystem(), outPath.Get(), "PLATFORM");
if (!pManifestKV->LoadFromFile(FileSystem(), outPath.Get(), "PLATFORM"))
{
pManifestKV->DeleteThis();
return nullptr;
}
return pManifestKV;
}
@ -278,7 +282,7 @@ static bool GetEntryValues(CUtlVector<VPKKeyValues_t>& entryValues,
if (!pManifestKV)
{
Warning(eDLL_T::FS, "Invalid VPK build manifest KV; unable to parse entry list\n");
Error(eDLL_T::FS, NO_ERROR, "Invalid or missing VPK build manifest KV; unable to parse entry list\n");
return false;
}