src/fcint.h (FcCacheBankToIndex);

Fix segfault by guarding array dereference.

diff --git a/ChangeLog b/ChangeLog
index d49ecc4df9843a5a26f2d1c2b6b4d6f106a0587e..849d55e6581dc6cfa889f1847639573df3274888 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-29  Patrick Lam  <plam@mit.edu>
+       * src/fcint.h (FcCacheBankToIndex);
+
+       Fix segfault by guarding array dereference.
+
 2005-11-29  Dirk Mueller  <dmueller@suse.de>
        reviewed by: plam
        

diff --git a/src/fcint.h b/src/fcint.h
index c61a2326cc0047e4fc781f5dc9f6152c0cacd896..5c2425b816edb157a4b580b6f6608bbd665c30d5 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[*_fcBankIdx] == bank ? *_fcBankIdx : FcCacheBankToIndexMTF(bank);
+    return (_fcBankId && _fcBankId[*_fcBankIdx] == bank) ? *_fcBankIdx : FcCacheBankToIndexMTF(bank);
 }
 
 const char *