mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-21 18:40:01 +00:00
Code Issues Projects Releases Wiki Activity

Fix conversion to UTF8 for ESM4 Reader strings

Browse Source 
toUtf8 returns a string view to the input when input string is ASCII and nothing
is written to the buffer which means output string of Reader::getStringImpl is
not modified.

Move input to the output string and resize it in this case.
This commit is contained in:
elsid 2022-09-12 01:25:44 +02:00
parent 80d52e3da8
commit 4f7dcd5ae5
No known key found for this signature in database
GPG Key ID: 4DE04C198CBA7625
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/esm4/reader.cpp
View File

@ -652,7 +652,12 @@ bool Reader::getStringImpl(std::string& str, std::size_t size,
stream.read(input.data(), size); stream.read(input.data(), size);
if (stream.gcount() == static_cast<std::streamsize>(size)) if (stream.gcount() == static_cast<std::streamsize>(size))
{ {
encoder->getUtf8(input, ToUTF8::BufferAllocationPolicy::FitToRequiredSize, str); const std::string_view result = encoder->getUtf8(input, ToUTF8::BufferAllocationPolicy::FitToRequiredSize, str);
if (str.empty() && !result.empty())
{
str = std::move(input);
str.resize(result.size());
}
return true; return true;
} }
} }