pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

x2t - fix bugs

Browse Source
This commit is contained in:
ElenaSubbotina
2020-09-30 15:34:11 +03:00
parent 91c50e6620
commit 6ecdc4acfd
122 changed files with 243 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OfficeCryptReader/source/ECMACryptFile.cpp
View File

@ -732,13 +732,14 @@ bool ECMACryptFile::EncryptOfficeFile(const std::wstring &file_name_inp, const s
lengthData = cryptor.Encrypt(data, lengthData, data_out);
cryptor.UpdateDataIntegrity(data_out, lengthData);
if (!data_out)
if (NULL == data_out)
{
delete []data;
return false;
}
cryptor.UpdateDataIntegrity(data_out, lengthData);
//-------------------------------------------------------------------
#if defined(_WIN32) || defined(_WIN64)
IStorage *winStorage = NULL;
@ -772,6 +773,13 @@ bool ECMACryptFile::EncryptOfficeFile(const std::wstring &file_name_inp, const s
delete pStream;
#endif
//-------------------------------------------------------------------
if (data_out)
{
delete []data_out;
data_out = NULL;
}
cryptor.GetCryptData(cryptData);
#if defined(_WIN32) || defined(_WIN64)