1 files changed, 14 insertions, 4 deletions
diff --git a/src/gui/text/qfontsubset.cpp b/src/gui/text/qfontsubset.cpp
index 152e15a54d..2109b16bb5 100644
--- a/src/gui/text/qfontsubset.cpp
+++ b/src/gui/text/qfontsubset.cpp
@@ -201,12 +201,22 @@ static void checkRanges(QPdf::ByteStream &ts, QByteArray &ranges, int &nranges)
 QVector<int> QFontSubset::getReverseMap() const
 {
     QVector<int> reverseMap(0x10000, 0);
-    QGlyphLayoutArray<10> glyphs;
+
+    glyph_t glyph;
+
+    QGlyphLayout glyphs;
+    glyphs.glyphs = &glyph;
+    glyphs.numGlyphs = 1;
+
     for (uint uc = 0; uc < 0x10000; ++uc) {
         QChar ch(uc);
-        int nglyphs = 10;
-        fontEngine->stringToCMap(&ch, 1, &glyphs, &nglyphs, QFontEngine::GlyphIndicesOnly);
-        int idx = glyph_indices.indexOf(glyphs.glyphs[0]);
+
+        int nglyphs = 1;
+        if (!fontEngine->stringToCMap(&ch, 1, &glyphs, &nglyphs, QFontEngine::GlyphIndicesOnly))
+            Q_UNREACHABLE();
+        Q_ASSERT(nglyphs == 1);
+
+        int idx = glyph_indices.indexOf(glyph);
         if (idx >= 0 && !reverseMap.at(idx))
             reverseMap[idx] = uc;
     }