mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-14 17:26:33 +00:00
Code Issues Releases Wiki Activity

Check for failures after reading from stream in BSA

Browse source
This commit is contained in:
elsid 2025-09-21 01:04:37 +02:00
parent 801224749f
commit a111391992
No known key found for this signature in database
GPG key ID: B845CB9FEE18AB40
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
components/bsa/bsafile.cpp
View file

@ -25,9 +25,12 @@
#include <algorithm> #include <algorithm>
#include <cassert> #include <cassert>
#include <cerrno>
#include <cstring> #include <cstring>
#include <filesystem> #include <filesystem>
#include <format>
#include <fstream> #include <fstream>
#include <system_error>
#include <components/esm/fourcc.hpp> #include <components/esm/fourcc.hpp>
#include <components/files/constrainedfilestream.hpp> #include <components/files/constrainedfilestream.hpp>
@ -120,6 +123,9 @@ void BSAFile::readHeader()
input.read(reinterpret_cast<char*>(head), 12); input.read(reinterpret_cast<char*>(head), 12);
if (input.fail())
fail(std::format("Failed to read head: {}", std::generic_category().message(errno)));
if (head[0] != 0x100) if (head[0] != 0x100)
fail("Unrecognized BSA header"); fail("Unrecognized BSA header");
@ -141,16 +147,25 @@ void BSAFile::readHeader()
std::vector<uint32_t> offsets(3 * filenum); std::vector<uint32_t> offsets(3 * filenum);
input.read(reinterpret_cast<char*>(offsets.data()), 12 * filenum); input.read(reinterpret_cast<char*>(offsets.data()), 12 * filenum);
if (input.fail())
fail(std::format("Failed to read offsets: {}", std::generic_category().message(errno)));
// Read the string table // Read the string table
mStringBuf.resize(dirsize - 12 * filenum); mStringBuf.resize(dirsize - 12 * filenum);
input.read(mStringBuf.data(), mStringBuf.size()); input.read(mStringBuf.data(), mStringBuf.size());
if (input.fail())
fail(std::format("Failed to read string table: {}", std::generic_category().message(errno)));
// Check our position // Check our position
assert(input.tellg() == std::streampos(12 + dirsize)); assert(input.tellg() == std::streampos(12 + dirsize));
std::vector<Hash> hashes(filenum); std::vector<Hash> hashes(filenum);
static_assert(sizeof(Hash) == 8); static_assert(sizeof(Hash) == 8);
input.read(reinterpret_cast<char*>(hashes.data()), 8 * filenum); input.read(reinterpret_cast<char*>(hashes.data()), 8 * filenum);
if (input.fail())
fail(std::format("Failed to read hashes: {}", std::generic_category().message(errno)));
// Calculate the offset of the data buffer. All file offsets are // Calculate the offset of the data buffer. All file offsets are
// relative to this. 12 header bytes + directory + hash table // relative to this. 12 header bytes + directory + hash table
// (skipped) // (skipped)