mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-30 12:32:36 +00:00
Code Issues Projects Releases Wiki Activity

Make BA2 extension hash calculation safer (#7784)

Browse Source
This commit is contained in:
Alexei Kotov 2024-01-21 22:54:54 +03:00
parent c45c2355ae
commit 84ab7afd44
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/bsa/ba2dx10file.cpp
View File

@ -177,7 +177,7 @@ namespace Bsa
return std::nullopt; // folder not found return std::nullopt; // folder not found
uint32_t fileHash = generateHash(fileName); uint32_t fileHash = generateHash(fileName);
uint32_t extHash = *reinterpret_cast<const uint32_t*>(ext.data() + 1); uint32_t extHash = generateExtensionHash(ext);
auto iter = it->second.find({ fileHash, extHash }); auto iter = it->second.find({ fileHash, extHash });
if (iter == it->second.end()) if (iter == it->second.end())
return std::nullopt; // file not found return std::nullopt; // file not found

8
components/bsa/ba2file.cpp
View File

@ -46,4 +46,12 @@ namespace Bsa
return result; return result;
} }
uint32_t generateExtensionHash(std::string_view extension)
{
uint32_t result = 0;
for (size_t i = 0; i < 4 && i < extension.size() - 1; i++)
result |= static_cast<uint8_t>(extension[i + 1]) << (8 * i);
return result;
}
} // namespace Bsa } // namespace Bsa

1
components/bsa/ba2file.hpp
View File

@ -7,6 +7,7 @@
namespace Bsa namespace Bsa
{ {
uint32_t generateHash(const std::string& name); uint32_t generateHash(const std::string& name);
uint32_t generateExtensionHash(std::string_view extension);
} }
#endif #endif

2
components/bsa/ba2gnrlfile.cpp
View File

@ -172,7 +172,7 @@ namespace Bsa
return FileRecord(); // folder not found, return default which has offset of sInvalidOffset return FileRecord(); // folder not found, return default which has offset of sInvalidOffset
uint32_t fileHash = generateHash(fileName); uint32_t fileHash = generateHash(fileName);
uint32_t extHash = *reinterpret_cast<const uint32_t*>(ext.data() + 1); uint32_t extHash = generateExtensionHash(ext);
auto iter = it->second.find({ fileHash, extHash }); auto iter = it->second.find({ fileHash, extHash });
if (iter == it->second.end()) if (iter == it->second.end())
return FileRecord(); // file not found, return default which has offset of sInvalidOffset return FileRecord(); // file not found, return default which has offset of sInvalidOffset