Imported Upstream version 2.11.93

[platform/upstream/fontconfig.git] / src / fclist.c

diff --git a/src/fclist.c b/src/fclist.c
index b7ae899..d7e8fc0 100644 (file)
--- a/src/fclist.c
+++ b/src/fclist.c
@@ -212,6 +212,8 @@ FcListPatternMatchAny (const FcPattern *p,
 {
     int                    i;
 
+    if (!p)
+       return FcFalse;
     for (i = 0; i < p->num; i++)
     {
        FcPatternElt    *pe = &FcPatternElts(p)[i];
@@ -252,6 +254,7 @@ FcListValueHash (FcValue    *value)
 {
     FcValue v = FcValueCanonicalize(value);
     switch (v.type) {
+    case FcTypeUnknown:
     case FcTypeVoid:
        return 0;
     case FcTypeInteger:
@@ -267,9 +270,11 @@ FcListValueHash (FcValue    *value)
     case FcTypeCharSet:
        return FcCharSetCount (v.u.c);
     case FcTypeFTFace:
-       return (long) v.u.f;
+       return (intptr_t) v.u.f;
     case FcTypeLangSet:
        return FcLangSetHash (v.u.l);
+    case FcTypeRange:
+       return FcRangeHash (v.u.r);
     }
     return 0;
 }