mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-31 18:45:36 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix_get_hash' into 'master'

Browse source 
Fix recover from errors in Files::getHash

See merge request OpenMW/openmw!1777
This commit is contained in:
psi29a 2022-04-15 21:37:28 +00:00
commit c78cc38383
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/openmw_test_suite/files/hash.cpp
View file

@ -22,6 +22,16 @@ namespace
struct FilesGetHash : TestWithParam<Params> {};
TEST(FilesGetHash, shouldClearErrors)
{
const std::string fileName = "fileName";
std::string content;
std::fill_n(std::back_inserter(content), 1, 'a');
std::istringstream stream(content);
stream.exceptions(std::ios::failbit | std::ios::badbit);
EXPECT_THAT(getHash(fileName, stream), ElementsAre(9607679276477937801ull, 16624257681780017498ull));
}
TEST_P(FilesGetHash, shouldReturnHashForStringStream)
{
const std::string fileName = "fileName";

2
components/files/hash.cpp
View file

@ -28,8 +28,8 @@ namespace Files
MurmurHash3_x64_128(value.data(), static_cast<int>(read), hash.data(), blockHash.data());
hash = blockHash;
}
stream.exceptions(exceptions);
stream.clear();
stream.exceptions(exceptions);
stream.seekg(start);
}
catch (const std::exception& e)