Avoid check on _fcBankId nullness and fix case where it used to crash.

diff --git a/ChangeLog b/ChangeLog
index b9bd677c8791db633220e26585884f4022f44fb3..f58f2372ebc6a7a8dcf26cc5558ff1ef4b0782ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,13 @@
 
        Bump version to 2.3.93.
 
+2005-12-20  Patrick Lam  <plam@mit.edu>
+       * src/fccharset.c (FcLangCharSetPopulate):
+       * src/fcint.h (FcCacheBankToIndex):
+
+       Avoid check on _fcBankId nullness and fix case where it used to
+       crash.
+
 2005-12-20  Patrick Lam  <plam@mit.edu>
        * src/fcxml.c (FcConfigParseAndLoad):
 

diff --git a/src/fccharset.c b/src/fccharset.c
index 11e8763304b87bf255de6ca5f16467cb1406e376..8a66cc2a93f90c25dee532d032da1691aae99b68 100644 (file)
--- a/src/fccharset.c
+++ b/src/fccharset.c
@@ -48,7 +48,7 @@ FcCharSetEnsureBank (int bi);
 void
 FcLangCharSetPopulate (void)
 {
-    int bi = FcCacheBankToIndex (FC_BANK_LANGS);
+    int bi = FcCacheBankToIndexMTF (FC_BANK_LANGS);
     FcCharSetEnsureBank (bi);
     charsets[bi] = 0;
     numbers[bi] = (FcChar16 *)&langBankNumbers;

diff --git a/src/fcint.h b/src/fcint.h
index 5c2425b816edb157a4b580b6f6608bbd665c30d5..c3430ae73faf0828274bc3cf2696d6f162426957 100644 (file)
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -469,7 +469,7 @@ FcCacheBankToIndexMTF (int bank);
 static __inline__ int
 FcCacheBankToIndex (int bank)
 {
-    return (_fcBankId && _fcBankId[*_fcBankIdx] == bank) ? *_fcBankIdx : FcCacheBankToIndexMTF(bank);
+    return (_fcBankId[*_fcBankIdx] == bank) ? *_fcBankIdx : FcCacheBankToIndexMTF(bank);
 }
 
 const char *