mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vcl: these compare functions use subtraction and could overflow

Browse Source 
Change-Id: I84c7a4cde694395fa70c60edffd63fb45ffcb3a8
This commit is contained in:
Michael Stahl
2015-02-19 16:55:04 +01:00
parent 250ef02bd8
commit b825167228
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
vcl/source/fontsubset/ttcr.cxx
View File

@@ -148,7 +148,9 @@ _inline void PutUInt32(sal_uInt32 val, sal_uInt8 *ptr, sal_uInt32 offset, int bi
static int TableEntryCompareF(const void *l, const void *r)
{
return ((const TableEntry *) l)->tag - ((const TableEntry *) r)->tag;
sal_uInt32 const ltag(static_cast<TableEntry const*>(l)->tag);
sal_uInt32 const rtag(static_cast<TableEntry const*>(r)->tag);
return (ltag == rtag) ? 0 : (ltag < rtag) ? -1 : 1;
}
static int NameRecordCompareF(const void *l, const void *r)
@@ -157,13 +159,13 @@ static int NameRecordCompareF(const void *l, const void *r)
NameRecord *rr = (NameRecord *) r;
if (ll->platformID != rr->platformID) {
return ll->platformID - rr->platformID;
return (ll->platformID < rr->platformID) ? -1 : 1;
} else if (ll->encodingID != rr->encodingID) {
return ll->encodingID - rr->encodingID;
return (ll->encodingID < rr->encodingID) ? -1 : 1;
} else if (ll->languageID != rr->languageID) {
return ll->languageID - rr->languageID;
return (ll->languageID < rr->languageID) ? -1 : 1;
} else if (ll->nameID != rr->nameID) {
return ll->nameID - rr->nameID;
return (ll->nameID < rr->nameID) ? -1 : 1;
}
return 0;
}