phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-05-06 17:13:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix(wcp): cap pack file count at unpack limit (1M)

Browse source 
Pack previously trusted recursive_directory_iterator to terminate
naturally — fine on most zones but a hostile symlink loop or a
giant accidental subdirectory would produce an archive with > 1M
files, which the unpack header check rejects wholesale. Cap at the
unpack limit and log a warning so the resulting WCP is at least
loadable, even if incomplete.
This commit is contained in:
Kelsi 2026-05-06 09:36:54 -07:00
parent 377cfb32d3
commit e6b0a84f3a
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tools/editor/content_pack.cpp
View file

@ -31,9 +31,19 @@ bool ContentPacker::packZone(const std::string& outputDir, const std::string& ma
// on Windows are readable on Linux/macOS and vice versa — the unpack
// path-traversal check rejects '\' as an absolute prefix, so a Windows
// path leaks would silently fail to extract.
//
// Cap total file count at the unpack-side limit (1M) so a runaway
// recursive_directory_iterator on a hostile symlink loop or a giant
// accidental subdirectory doesn't produce an unpackable archive.
constexpr size_t kMaxFiles = 1'000'000;
std::vector<std::pair<std::string, std::string>> files; // relative path, full path
for (auto& entry : fs::recursive_directory_iterator(srcDir)) {
if (!entry.is_regular_file()) continue;
if (files.size() >= kMaxFiles) {
LOG_WARNING("WCP file count cap reached (", kMaxFiles,
"); remaining files in ", srcDir, " omitted");
break;
}
std::string rel = fs::relative(entry.path(), srcDir).string();
std::replace(rel.begin(), rel.end(), '\\', '/');
files.push_back({rel, entry.path().string()});