diff options
Diffstat (limited to 'fontconfig/src')
| -rw-r--r-- | fontconfig/src/fcblanks.c | 3 | ||||
| -rw-r--r-- | fontconfig/src/fcinit.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/fontconfig/src/fcblanks.c b/fontconfig/src/fcblanks.c index f163a8f40..5132a510f 100644 --- a/fontconfig/src/fcblanks.c +++ b/fontconfig/src/fcblanks.c @@ -93,8 +93,7 @@ FcBlanksIsMember (FcBlanks *b, FcChar32 ucs4) middle = (lower + higher) / 2; if (b->blanks[middle] == ucs4) return FcTrue; - if (middle == lower || - middle == higher) + if (lower >= higher) break; if (b->blanks[middle] < ucs4) lower = middle + 1; diff --git a/fontconfig/src/fcinit.c b/fontconfig/src/fcinit.c index db62c21f2..6134ed40d 100644 --- a/fontconfig/src/fcinit.c +++ b/fontconfig/src/fcinit.c @@ -209,6 +209,8 @@ FcInitBringUptoDate (void) FcConfig *config = FcConfigGetCurrent (); time_t now; + if (!config) + return FcFalse; /* * rescanInterval == 0 disables automatic up to date */ |