diff --git a/gfx/2d/ScaledFontMac.cpp b/gfx/2d/ScaledFontMac.cpp
index e0a783a9bf5d..1339f8fa632a 100644
--- a/gfx/2d/ScaledFontMac.cpp
+++ b/gfx/2d/ScaledFontMac.cpp
@@ -290,7 +290,7 @@ bool UnscaledFontMac::GetFontFileData(FontFileDataOutput aDataCallback,
   bool CFF = false;
   for (CFIndex i = 0; i < count; i++) {
     uint32_t tag = (uint32_t)(uintptr_t)CFArrayGetValueAtIndex(tags, i);
-    if (tag == 0x43464620) {  // 'CFF '
+    if (tag == 0x43464620 || tag == 0x43464632) {  // 'CFF ', 'CFF2'
       CFF = true;
     }
     CFDataRef data = CGFontCopyTableForTag(mFont, tag);
diff --git a/gfx/tests/crashtests/1938548.html b/gfx/tests/crashtests/1938548.html
new file mode 100644
index 000000000000..963ed05947b6
--- /dev/null
+++ b/gfx/tests/crashtests/1938548.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+
+<meta charset="utf-8">
+
+<style>
+@font-face {
+  font-family: test;
+  /* WhiteOnBlack CFF2 font from https://github.com/adobe-fonts/white-on-black-vf,
+     licensed under the SIL Open Font License version 1.1 */
+  src: url(WhiteOnBlack.otf);
+}
+div {
+  font: 40px test;
+}
+</style>
+
+<div>&#x328E;</div>
+
+<canvas id="c"></canvas>
+
+<script>
+document.fonts.ready.then(() => {
+  var ctx = document.getElementById("c").getContext("2d");
+  ctx.font = "40px test";
+  ctx.fillText("\u328E", 0, 100);
+});
+</script>
diff --git a/gfx/tests/crashtests/WhiteOnBlack.otf b/gfx/tests/crashtests/WhiteOnBlack.otf
new file mode 100644
index 000000000000..fd4dad6b96a9
Binary files /dev/null and b/gfx/tests/crashtests/WhiteOnBlack.otf differ
diff --git a/gfx/tests/crashtests/crashtests.list b/gfx/tests/crashtests/crashtests.list
index 6018a33e6e8d..0485acb9c294 100644
--- a/gfx/tests/crashtests/crashtests.list
+++ b/gfx/tests/crashtests/crashtests.list
@@ -225,4 +225,4 @@ load 1825450.html
 load 1683679.html
 load 1843622.html
 load 1898569.html
-
+load 1938548.html
