Attachment 134340 Details for Bug 102880 – FoFiTrueType::readPostTable() from xpdf 4.00

[patch] FoFiTrueType::readPostTable() from xpdf 4.00

missletters.patch (text/plain), 1.91 KB, created by Thomas Freitag on 2017-09-19 15:04:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Freitag

Created: 2017-09-19 15:04:28 UTC

Size: 1.91 KB

patch

obsolete

>diff --git a/fofi/FoFiTrueType.cc b/fofi/FoFiTrueType.cc
>index f1a15e0..1437b1d 100644
>--- a/fofi/FoFiTrueType.cc
>+++ b/fofi/FoFiTrueType.cc
>@@ -1448,7 +1448,7 @@ void FoFiTrueType::parse() {
> 
> void FoFiTrueType::readPostTable() {
>   GooString *name;
>-  int tablePos, postFmt, stringIdx, stringPos, savedStringIdx;
>+  int tablePos, postFmt, stringIdx, stringPos;
>   GBool ok;
>   int i, j, n, m;
> 
>@@ -1478,38 +1478,30 @@ void FoFiTrueType::readPostTable() {
>     stringIdx = 0;
>     stringPos = tablePos + 34 + 2*n;
>     for (i = 0; i < n; ++i) {
>+      ok = gTrue;
>       j = getU16BE(tablePos + 34 + 2*i, &ok);
>       if (j < 258) {
> 	nameToGID->removeInt(macGlyphNames[j]);
> 	nameToGID->add(new GooString(macGlyphNames[j]), i);
>       } else {
>-	savedStringIdx = stringIdx;
> 	j -= 258;
> 	if (j != stringIdx) {
> 	  for (stringIdx = 0, stringPos = tablePos + 34 + 2*n;
> 	       stringIdx < j;
> 	       ++stringIdx, stringPos += 1 + getU8(stringPos, &ok)) ;
> 	  if (!ok) {
>-	    goto err;
>+	    continue;
> 	  }
> 	}
> 	m = getU8(stringPos, &ok);
> 	if (!ok || !checkRegion(stringPos + 1, m)) {
>-	  stringIdx = savedStringIdx;
>-	  if (j < 258) {
>-	    ok = gTrue;
>-	    nameToGID->removeInt(macGlyphNames[j]);
>-	    nameToGID->add(new GooString(macGlyphNames[0]), i);
>-	  } else {
>-	    goto err;
>-	  }
>-	} else {
>-	  name = new GooString((char *)&file[stringPos + 1], m);
>-	  nameToGID->removeInt(name);
>-	  nameToGID->add(name, i);
>-	  ++stringIdx;
>-	  stringPos += 1 + m;
>-        }
>+	  continue;
>+	}
>+	name = new GooString((char *)&file[stringPos + 1], m);
>+	nameToGID->removeInt(name);
>+	nameToGID->add(name, i);
>+	++stringIdx;
>+	stringPos += 1 + m;
>       }
>     }
>   } else if (postFmt == 0x00028000) {
>@@ -1517,7 +1509,7 @@ void FoFiTrueType::readPostTable() {
>     for (i = 0; i < nGlyphs; ++i) {
>       j = getU8(tablePos + 32 + i, &ok);
>       if (!ok) {
>-	goto err;
>+	continue;
>       }
>       if (j < 258) {
> 	nameToGID->removeInt(macGlyphNames[j]);

Actions: View | Splinter Review

Attachments on bug 102880: 134339 | 134340 | 136428

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.