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

Merge branch 'release/v9.3.0' of https://git.onlyoffice.com/ONLYOFFICE/core into release/v9.3.0

Browse Source
This commit is contained in:
Elena Subbotina
2025-12-12 12:21:50 +03:00
parent 964a44ed93 40c4c922c1
commit db279bd725
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
MsBinaryFile/XlsFile/Format/Binary/CFRecord.cpp
View File

@ -49,6 +49,17 @@ CFRecord::CFRecord(CFStreamPtr stream, GlobalWorkbookInfoPtr global_info)
unsigned short size_short;
*stream >> size_short;
size_ = size_short;
const auto maxRecordSize = 8224;
if(size_ > maxRecordSize)
{
type_id_ = -1;
}
auto streamSize = stream->getStreamSize();
if(stream->getStreamPointer() + size_ > streamSize)
{
size_ = streamSize - stream->getStreamPointer();
type_id_ = -1;
}
data_ = new char[size_];
unsigned long rec_data_pos = stream->getStreamPointer();

12
MsBinaryFile/XlsFile/Format/Binary/CFRecord.h
View File

@ -175,12 +175,12 @@ private:
CFStream::ReceiverItems receiver_items;
CFStream::SourceItems source_items;
unsigned int file_ptr;
CFRecordType::TypeId type_id_;
size_t size_;
char* data_;
BYTE sizeOfRecordTypeRecordLength; //размер RecordType и RecordLength
size_t rdPtr;
unsigned int file_ptr = 0;
CFRecordType::TypeId type_id_ = 0;
size_t size_ = 0;
char* data_ = 0;
BYTE sizeOfRecordTypeRecordLength = 0; //размер RecordType и RecordLength
size_t rdPtr = 0;
static char intData[MAX_RECORD_SIZE_XLSB];
GlobalWorkbookInfoPtr global_info_;