Commit 19ea60bc authored by Patrick Lam's avatar Patrick Lam
Browse files

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

parent 3bfae75d
...@@ -6,6 +6,13 @@ ...@@ -6,6 +6,13 @@
Bump version to 2.3.93. 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> 2005-12-20 Patrick Lam <plam@mit.edu>
* src/fcxml.c (FcConfigParseAndLoad): * src/fcxml.c (FcConfigParseAndLoad):
......
...@@ -48,7 +48,7 @@ FcCharSetEnsureBank (int bi); ...@@ -48,7 +48,7 @@ FcCharSetEnsureBank (int bi);
void void
FcLangCharSetPopulate (void) FcLangCharSetPopulate (void)
{ {
int bi = FcCacheBankToIndex (FC_BANK_LANGS); int bi = FcCacheBankToIndexMTF (FC_BANK_LANGS);
FcCharSetEnsureBank (bi); FcCharSetEnsureBank (bi);
charsets[bi] = 0; charsets[bi] = 0;
numbers[bi] = (FcChar16 *)&langBankNumbers; numbers[bi] = (FcChar16 *)&langBankNumbers;
......
...@@ -469,7 +469,7 @@ FcCacheBankToIndexMTF (int bank); ...@@ -469,7 +469,7 @@ FcCacheBankToIndexMTF (int bank);
static __inline__ int static __inline__ int
FcCacheBankToIndex (int bank) FcCacheBankToIndex (int bank)
{ {
return (_fcBankId && _fcBankId[*_fcBankIdx] == bank) ? *_fcBankIdx : FcCacheBankToIndexMTF(bank); return (_fcBankId[*_fcBankIdx] == bank) ? *_fcBankIdx : FcCacheBankToIndexMTF(bank);
} }
const char * const char *
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment