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 remote-tracking branch 'origin/release/v6.1.0' into develop

Browse Source
This commit is contained in:
ElenaSubbotina
2020-10-22 15:56:11 +03:00
parent ba63a63e81 60a3d3ad19
commit 4e1804e159
190 changed files with 2893 additions and 585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
DesktopEditor/cximage/jasper/jpc/jpc_dec.c
View File

@ -2171,7 +2171,12 @@ int jpc_ppxstab_insert(jpc_ppxstab_t *tab, jpc_ppxstabent_t *ent)
int inspt;
int i;
for (i = 0; i < tab->numents; ++i) {
// check on MAX_INT
int correct_num_ents = tab->numents;
if (correct_num_ents > 0x7FFFFFFE)
correct_num_ents = 0x7FFFFFFE;
for (i = 0; i < correct_num_ents; ++i) {
if (tab->ents[i]->ind > ent->ind) {
break;
}