src/fcblanks.c | 3 +--
src/fcinit.c | 2 ++
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 484834c186dee281bcd13067d7b7bce1322b4e0b
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Fri Mar 6 11:15:26 2015 +0900
Fix a bug in the previous change forFcBlanksIsMember()
diff --git a/src/fcblanks.c b/src/fcblanks.c
index f163a8f..9ac0d5b 100644
--- a/src/fcblanks.c
+++ b/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;
commit ed74a58ccc245bacd907cd91e0f3df64e427c163
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Fri Mar 6 11:05:23 2015 +0900
Fix a segfault when OOM happened.
Reported by Matt Breedlove
diff --git a/src/fcinit.c b/src/fcinit.c
index db62c21..6134ed4 100644
--- a/src/fcinit.c
+++ b/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
*/
_______________________________________________
Fontconfig mailing list
Fontconfig@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/fontconfig
