From fcb96af0215a9ae070face3997cdf84dafc057e5 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Mon, 17 Jun 2019 08:33:22 +0200 Subject: distancefieldgenerator: Fix cmap error for some fonts We would accidentally use the raw field from the font without converting its endianness, thus we would sanity check against the wrong length and print out error messages for some perfectly valid cmap subtables. [ChangeLog][distancefieldgenerator] Fixed bug where the tool would fail for valid fonts with the message "end of cmap table reached when parsing subtable". Task-number: QTBUG-76188 Change-Id: I7f84f4e161da705b49423ed3cc16a78cee67c607 Reviewed-by: Simon Hausmann --- src/distancefieldgenerator/distancefieldmodelworker.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/distancefieldgenerator/distancefieldmodelworker.cpp b/src/distancefieldgenerator/distancefieldmodelworker.cpp index 373cb05ab..d140ff219 100644 --- a/src/distancefieldgenerator/distancefieldmodelworker.cpp +++ b/src/distancefieldgenerator/distancefieldmodelworker.cpp @@ -129,7 +129,7 @@ static void readCmapSubtable(DistanceFieldModelWorker *worker, const QByteArray return; } - const void *end = cmap.constData() + tableOffset + subtable->length; + const void *end = cmap.constData() + tableOffset + length; worker->readCmapSubtable(subtable, end); } -- cgit v1.2.3