summaryrefslogtreecommitdiff
path: root/print/xpdf/patches/patch-as
diff options
context:
space:
mode:
Diffstat (limited to 'print/xpdf/patches/patch-as')
-rw-r--r--print/xpdf/patches/patch-as30
1 files changed, 30 insertions, 0 deletions
diff --git a/print/xpdf/patches/patch-as b/print/xpdf/patches/patch-as
new file mode 100644
index 00000000000..49803fadd3c
--- /dev/null
+++ b/print/xpdf/patches/patch-as
@@ -0,0 +1,30 @@
+$NetBSD: patch-as,v 1.1 2005/08/12 12:27:30 salo Exp $
+
+Fix for CAN-2005-2097, from Ubuntu and RedHat.
+
+--- xpdf/SplashOutputDev.cc.orig 2004-01-22 02:26:45.000000000 +0100
++++ xpdf/SplashOutputDev.cc 2005-08-12 13:54:26.000000000 +0200
+@@ -621,16 +621,19 @@
+ }
+ break;
+ case fontTrueType:
+- if (!(ff = FoFiTrueType::load(fileName->getCString()))) {
+- goto err2;
+- }
++ 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, 256))) {
++ codeToGID, n))) {
+ error(-1, "Couldn't create a font for '%s'",
+ gfxFont->getName() ? gfxFont->getName()->getCString()
+ : "(unnamed)");