lobo/isync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix overflows in uint comparisons

Browse Source
This commit is contained in:
Oswald Buddenhagen 2019-11-22 21:00:18 +01:00
parent a33e44758b
commit bee4fc54e7
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/drv_maildir.c
View File

@ -840,8 +840,8 @@ maildir_compare( const void *l, const void *r )
char *ldot, *rdot, *ldot2, *rdot2, *lseq, *rseq; char *ldot, *rdot, *ldot2, *rdot2, *lseq, *rseq;
int ret, llen, rlen; int ret, llen, rlen;
if ((ret = lm->uid - rm->uid)) if (lm->uid != rm->uid) // Can't subtract, the result might not fit into signed int.
return ret; return lm->uid > rm->uid ? 1 : -1;
/* No UID, so sort by arrival date. We should not do this, but we rely /* No UID, so sort by arrival date. We should not do this, but we rely
on the suggested unique file name scheme - we have no choice. */ on the suggested unique file name scheme - we have no choice. */

5
src/util.c
View File

@ -534,7 +534,10 @@ map_name( const char *arg, char **result, int reserve, const char *in, const cha
static int static int
compare_uints( const void *l, const void *r ) compare_uints( const void *l, const void *r )
{ {
return *(uint *)l - *(uint *)r; uint li = *(uint *)l, ri = *(uint *)r;
if (li != ri) // Can't subtract, the result might not fit into signed int.
return li > ri ? 1 : -1;
return 0;
} }
void void