pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-07-19 11:42:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bug #65626

Browse Source
This commit is contained in:
Elena.Subbotina
2023-12-20 16:56:52 +03:00
parent 086fc272df
commit 0f055f696f
11 changed files with 37 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MsBinaryFile/DocFile/VirtualStreamReader.cpp
View File

@ -204,7 +204,7 @@ std::wstring VirtualStreamReader::ReadXst()
int xstzSize = DocFileFormat::FormatUtils::BytesToInt16( cch, 0, cchSize ) * 2;
xstz = ReadBytes(xstzSize, true);
DocFileFormat::FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &wstrResult, xstz, xstzSize, ENCODING_UTF16 );
wstrResult = NSFile::CUtf8Converter::GetWStringFromUTF16((unsigned short*)(xstz), xstzSize / 2);
}
RELEASEARRAYOBJECTS(xstz);
@ -228,7 +228,7 @@ std::wstring VirtualStreamReader::ReadLengthPrefixedUnicodeString()
//dont read the terminating zero
unsigned char* stringBytes = ReadBytes( ( cch * 2 ), true );
DocFileFormat::FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &result, stringBytes, ( ( cch * 2 ) - 2 ), ENCODING_UTF16 );
result = NSFile::CUtf8Converter::GetWStringFromUTF16((unsigned short*)(stringBytes), cch - 1);
RELEASEARRAYOBJECTS( stringBytes );
}