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

Merge pull request 'fix bug #78955' (#558) from fix/bug78955 into develop

Browse Source 
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/558
This commit is contained in:
Elena Subbotina
2025-12-05 14:30:49 +00:00
parent ac97a5680b 6ea64599bd
commit 7019b192bd
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
MsBinaryFile/XlsFile/Format/Logic/Biff_records/AutoFilter.cpp
View File

@ -72,7 +72,14 @@ void AutoFilter::readFields(CFRecord& record)
{ {
size_t pos_record = record.getRdPtr(); size_t pos_record = record.getRdPtr();
if (size == 0xffffffff) size = record.getDataSize() - pos_record;
if (size == 0xffffffff)
size = record.getDataSize() - pos_record;
else if(record.getDataSize() < pos_record + size)
{
//size error
return;
}
if (size > 0) if (size > 0)
{ {

2
MsBinaryFile/XlsFile/Format/Logic/Biff_structures/Feat11FdaAutoFilter.cpp
View File

@ -53,7 +53,7 @@ void Feat11FdaAutoFilter::load(CFRecord& record)
} }
record.skipNunBytes(2); record.skipNunBytes(2);
if (cbAutoFilter > 0 && cbAutoFilter < 2080) if (cbAutoFilter > 0 && cbAutoFilter < 2080 && (record.getDataSize() - record.getRdPtr()) >= cbAutoFilter)
{ {
recAutoFilter.size = cbAutoFilter; recAutoFilter.size = cbAutoFilter;
recAutoFilter.readFields(record); recAutoFilter.readFields(record);