1 files changed, 6 insertions, 0 deletions
diff --git a/modules/basic/basic-fc.c b/modules/basic/basic-fc.c
index 1ceaeabe..93c4478f 100644
--- a/modules/basic/basic-fc.c
+++ b/modules/basic/basic-fc.c
@@ -128,6 +128,12 @@ pango_fc_hb_font_get_glyph (hb_font_t *font, void *font_data,
     return TRUE;
 
   *glyph = PANGO_GET_UNKNOWN_GLYPH (unicode);
+
+  /* We draw our own invalid-Unicode shape, so prevent HarfBuzz
+   * from using REPLACEMENT CHARACTER. */
+  if (unicode > 0x10FFFF)
+    return TRUE;
+
   return FALSE;
 }