Attachment 43513 Details for Bug 96561

[patch] upstream patch

xpdf.patch (text/plain), 2.40 KB, created by Ludwig Nussel on 2005-07-27 07:29:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ludwig Nussel

Created: 2005-07-27 07:29:55 UTC

Size: 2.40 KB

patch

obsolete

>Index: FoFiTrueType.cc
>===================================================================
>RCS file: /home/derekn/src/cvs/fofi/FoFiTrueType.cc,v
>retrieving revision 1.17
>diff -c -r1.17 FoFiTrueType.cc
>*** FoFiTrueType.cc	14 Feb 2005 04:27:35 -0000	1.17
>--- FoFiTrueType.cc	27 Jul 2005 00:12:46 -0000
>***************
>*** 1631,1636 ****
>--- 1631,1657 ----
>      return;
>    }
>  
>+   // make sure the loca table is sane (correct length and entries are
>+   // in bounds)
>+   i = seekTable("loca");
>+   if (tables[i].len < (nGlyphs + 1) * (locaFmt ? 4 : 2)) {
>+     parsedOk = gFalse;
>+     return;
>+   }
>+   for (j = 0; j <= nGlyphs; ++j) {
>+     if (locaFmt) {
>+       pos = (int)getU32BE(tables[i].offset + j*4, &parsedOk);
>+     } else {
>+       pos = getU16BE(tables[i].offset + j*2, &parsedOk);
>+     }
>+     if (pos < 0 || pos > len) {
>+       parsedOk = gFalse;
>+     }
>+   }
>+   if (!parsedOk) {
>+     return;
>+   }
>+ 
>    // read the post table
>    readPostTable();
>  }
>Index: SplashOutputDev.cc
>===================================================================
>RCS file: /home/derekn/src/cvs/xpdf/SplashOutputDev.cc,v
>retrieving revision 1.54
>diff -c -r1.54 SplashOutputDev.cc
>*** SplashOutputDev.cc	24 Jun 2005 00:02:31 -0000	1.54
>--- SplashOutputDev.cc	27 Jul 2005 00:55:16 -0000
>***************
>*** 621,636 ****
>        }
>        break;
>      case fontTrueType:
>!       if (!(ff = FoFiTrueType::load(fileName->getCString()))) {
>! 	goto err2;
>        }
>-       codeToGID = ((Gfx8BitFont *)gfxFont)->getCodeToGIDMap(ff);
>-       delete ff;
>        if (!(fontFile = fontEngine->loadTrueTypeFont(
>  			   id,
>  			   fileName->getCString(),
>  			   fileName == tmpFileName,
>! 			   codeToGID, 256))) {
>  	error(-1, "Couldn't create a font for '%s'",
>  	      gfxFont->getName() ? gfxFont->getName()->getCString()
>  	                         : "(unnamed)");
>--- 1110,1128 ----
>        }
>        break;
>      case fontTrueType:
>!       if ((ff = FoFiTrueType::load(fileName->getCString()))) {
>! 	codeToGID = ((Gfx8BitFont *)gfxFont)->getCodeToGIDMap(ff);
>! 	n = 256;
>! 	delete ff;
>!       } else {
>! 	codeToGID = NULL;
>! 	n = 0;
>        }
>        if (!(fontFile = fontEngine->loadTrueTypeFont(
>  			   id,
>  			   fileName->getCString(),
>  			   fileName == tmpFileName,
>! 			   codeToGID, n))) {
>  	error(-1, "Couldn't create a font for '%s'",
>  	      gfxFont->getName() ? gfxFont->getName()->getCString()
>  	                         : "(unnamed)");

Actions: View | Diff

Attachments on bug 96561: 42033 | 42729 | 43513