Merge pull request #2439 from fonttools/i2438

Don't crash if there is no layer list
fonttools · Nov 3, 2021 · 6373893 · 6373893
2 parents b11d6f7 + 6144202
commit 6373893
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/Lib/fontTools/colorLib/unbuilder.py b/Lib/fontTools/colorLib/unbuilder.py
@@ -2,11 +2,14 @@
 from .table_builder import TableUnbuilder
 
 
-def unbuildColrV1(layerV1List, baseGlyphV1List):
-    unbuilder = LayerListUnbuilder(layerV1List.Paint)
+def unbuildColrV1(layerList, baseGlyphList):
+    layers = []
+    if layerList:
+        layers = layerList.Paint
+    unbuilder = LayerListUnbuilder(layers)
     return {
         rec.BaseGlyph: unbuilder.unbuildPaint(rec.Paint)
-        for rec in baseGlyphV1List.BaseGlyphPaintRecord
+        for rec in baseGlyphList.BaseGlyphPaintRecord
     }
 
 

diff --git a/Tests/colorLib/unbuilder_test.py b/Tests/colorLib/unbuilder_test.py
@@ -221,11 +221,16 @@
                 "Glyph": "glyph00012",
             },
         ],
-    },
+    }
 }
 
 
 def test_unbuildColrV1():
-    layersV1, baseGlyphsV1 = buildColrV1(TEST_COLOR_GLYPHS)
-    colorGlyphs = unbuildColrV1(layersV1, baseGlyphsV1)
+    layers, baseGlyphs = buildColrV1(TEST_COLOR_GLYPHS)
+    colorGlyphs = unbuildColrV1(layers, baseGlyphs)
     assert colorGlyphs == TEST_COLOR_GLYPHS
+
+def test_unbuildColrV1_noLayers():
+    _, baseGlyphsV1 = buildColrV1(TEST_COLOR_GLYPHS)
+    # Just looking to see we don't crash
+    unbuildColrV1(None, baseGlyphsV1)