pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

DocFormat - fix ole object (old format)

Browse Source
This commit is contained in:
ElenaSubbotina
2016-07-06 20:17:49 +03:00
parent 10aac61076
commit 2ca535d9e9
21 changed files with 635 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
ASCOfficeDocFile/DocDocxConverter/VirtualStreamReader.h
View File

@ -187,28 +187,35 @@ public:
std::wstring ReadXst()
{
std::wstring wstrResult( _T( "" ) );
if (stream)
if (!stream) return L"";
std::wstring wstrResult;
unsigned char* xstz = NULL;
unsigned char* cch = NULL;
if (olderVersion)
{
int cchSize = 1;
cch = ReadBytes( cchSize, true );
int xstzSize = FormatUtils::BytesToUChar( cch, 0, cchSize ) * 1;
xstz = ReadBytes(xstzSize, true);
FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &wstrResult, xstz, xstzSize, ENCODING_WINDOWS_1250 );
}
else
{
int cchSize = 2;
unsigned char* cch = this->ReadBytes( cchSize, true );
cch = ReadBytes( cchSize, true );
int xstzSize = FormatUtils::BytesToInt16( cch, 0, cchSize ) * 2;
unsigned char* xstz = ReadBytes(xstzSize, true);
xstz = ReadBytes(xstzSize, true);
if (this->olderVersion)
{
FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &wstrResult, xstz, xstzSize, ENCODING_WINDOWS_1250 );
}
else
{
FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &wstrResult, xstz, xstzSize, ENCODING_UTF16 );
}
RELEASEARRAYOBJECTS(xstz);
RELEASEARRAYOBJECTS(cch);
FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &wstrResult, xstz, xstzSize, ENCODING_UTF16 );
}
RELEASEARRAYOBJECTS(xstz);
RELEASEARRAYOBJECTS(cch);
return wstrResult;
}
@ -239,21 +246,42 @@ public:
/// The string must have the following structure:
/// unsigned char 1-4: Character count (cch)
/// unsigned char 5-cch+4: ANSI characters terminated by \0
std::wstring ReadLengthPrefixedAnsiString()
std::wstring ReadLengthPrefixedAnsiString(int max_size)
{
std::wstring result;
int cch = this->ReadInt32();
unsigned int cch = ReadUInt32();
if ( cch > 0 )
unsigned char* stringBytes = NULL;
if (cch > max_size)
{
//dont read the terminating zero
unsigned char* stringBytes = ReadBytes( cch, true );
//error ... skip to 0
int pos_orinal = GetPosition();
int pos = 0;
stringBytes = ReadBytes( max_size, true );
FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &result, stringBytes, ( cch - 1 ), ENCODING_WINDOWS_1250);
if (stringBytes)
{
while(pos < max_size)
{
if (stringBytes[pos] == 0)
break;
pos++;
}
}
Seek(pos_orinal + pos - 1, 0);
}else
if ( cch > 0 )
{
//dont read the terminating zero
stringBytes = ReadBytes( cch, true );
RELEASEARRAYOBJECTS( stringBytes );
}
FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &result, stringBytes, ( cch - 1 ), ENCODING_WINDOWS_1250);
}
RELEASEARRAYOBJECTS( stringBytes );
return result;
}