commit 835f9bbdbe7c023bce27f699c8906ace9b62a051
author Matthias Clasen <mclasen@redhat.com> Sat Aug 22 02:35:24 2020 -0400
committer Matthias Clasen <mclasen@redhat.com> Tue Aug 25 12:15:45 2020 -0400
tree 9c6059d0c6c95c5531649a9becec850eb09f5a7b
parent 148ebf98edb498d786f4c1107ec116e1afdf9541

Fixup: Promote ints to ranges when appropriate

Pointed out by Akira Tagoh.

src/fccfg.c

diff --git a/src/fccfg.c b/src/fccfg.c
index 13bd0ff..f86f680 100644
--- a/src/fccfg.c
+++ b/src/fccfg.c
@@ -939,6 +939,13 @@
     case FcTypeInteger:
         v.type = FcTypeDouble;
         v.u.d = (double) v.u.i;
+        /* Fallthrough */
+    case FcTypeDouble:
+        if (u.type == FcTypeRange && buf)
+        {
+            v.u.r = FcRangePromote (v.u.d, buf);
+            v.type = FcTypeRange;
+        }
         break;
     case FcTypeVoid:
         if (u.type == FcTypeMatrix)
@@ -964,13 +971,6 @@
             v.type = FcTypeLangSet;
         }
         break;
-    case FcTypeDouble:
-        if (u.type == FcTypeRange && buf)
-        {
-            v.u.r = FcRangePromote (v.u.d, buf);
-            v.type = FcTypeRange;
-        }
-        break;
     default:
         break;
     }