1 files changed, 8 insertions, 0 deletions

diff --git a/src/w32dwrite.c b/src/w32dwrite.c
index 4dc65b15db7..10af8545a11 100644
--- a/src/w32dwrite.c
+++ b/src/w32dwrite.c
@@ -610,6 +610,14 @@ text_extents_internal (IDWriteFontFace *dwrite_font_face,
                                                                nglyphs,
                                                                gmetrics,
                                                                false);
+
+  /* E_INVALIDARG means some of the glyphs index is out of bounds for the font.  */
+  if (hr == E_INVALIDARG)
+    {
+      SAFE_FREE ();
+      return false;
+    }
+
   if (!verify_hr (hr, "Failed to GetGdiCompatibleGlyphMetrics"))
     {
       SAFE_FREE ();