[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 src/fchash.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4ff7155f5c96a02f2cd3542e8546c76c632c315a
Author: Alexander Larsson <alexl at redhat.com>
Date:   Fri Jan 12 16:52:39 2018 +0100

    FcHashTableAddInternal: Compare against the right key
    
    We were comparing the passed in key with the ready-to-insert key
    rather than the key in the hashtable, so if you ever had a hash
    conflicts we'll never insert the new item.
    
    https://bugs.freedesktop.org/show_bug.cgi?id=101889

diff --git a/src/fchash.c b/src/fchash.c
index ba6a453..396f452 100644
--- a/src/fchash.c
+++ b/src/fchash.c
@@ -178,7 +178,7 @@ FcHashTableAddInternal (FcHashTable *table,
     for (prev = &table->buckets[hash % FC_HASH_SIZE];
 	 (b = fc_atomic_ptr_get (prev)); prev = &(b->next))
     {
-	if (!table->compare_func (bucket->key, key))
+	if (!table->compare_func (b->key, key))
 	{
 	    if (replace)
 	    {