[Fontconfig] [PATCH 1/1] FcCharSetHash(): use the 'numbers' values to compute the hash

Florent Rougon f.rougon at free.fr
Mon Jun 5 08:58:41 UTC 2017


Before this commit, FcCharSetHash() repeatedly used the address of the
'numbers' array of an FcCharSet to compute the FcCharSet hash, instead
of the value of each array element. This is not good for even spreading
of the FcCharSet objects among the various buckets of the hash table
(and should thus reduce performance). This bug appears to have been
mistakenly introduced in commit
cd2ec1a940888ebcbd323a8000d2fcced41ddf9e (June 2005).
---
 src/fccharset.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fccharset.c b/src/fccharset.c
index 3f17892..6e69f66 100644
--- a/src/fccharset.c
+++ b/src/fccharset.c
@@ -1113,7 +1113,7 @@ FcCharSetHash (FcCharSet *fcs)
 	hash = ((hash << 1) | (hash >> 31)) ^ FcCharLeafHash (FcCharSetLeaf(fcs,i));
     /* hash in numbers */
     for (i = 0; i < fcs->num; i++)
-	hash = ((hash << 1) | (hash >> 31)) ^ *FcCharSetNumbers(fcs);
+	hash = ((hash << 1) | (hash >> 31)) ^ FcCharSetNumbers(fcs)[i];
     return hash;
 }
 
-- 
2.11.0



More information about the Fontconfig mailing list