Skip to content

Fix use-after-free of the clothes TXD buffer after engineImportTXD #5357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Flashmyname wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −4
Open

Fix use-after-free of the clothes TXD buffer after engineImportTXD #5357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Client/mods/deathmatch/logic/CClientTXD.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,11 @@ bool CClientTXD::AddClothingTexture(const std::string& modelName)
return false;
}

return g_pGame->GetRenderWare()->ClothesAddFile(m_FileData.data(), m_FileData.size(), modelName.c_str());
if (!g_pGame->GetRenderWare()->ClothesAddFile(m_FileData.data(), m_FileData.size(), modelName.c_str()))
return false;

m_bUsingFileDataForClothes = true;
return true;
}

bool CClientTXD::Import(unsigned short usModelID)
Expand Down
6 changes: 3 additions & 3 deletions Client/mods/deathmatch/logic/CClientTXD.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ class CClientTXD final : public CClientEntity
bool GetFilenameToUse(SString& strOutFilename);

SString m_strFilename;
bool m_bFilteringEnabled;
bool m_bIsRawData;
bool m_bUsingFileDataForClothes;
bool m_bFilteringEnabled = false;
bool m_bIsRawData = false;
bool m_bUsingFileDataForClothes = false;
SString m_FileData;
SReplacementTextures m_ReplacementTextures;
};
Loading