SOURCES (RA-branch): cups-CAN-2005-2097.patch - backported to 1.1....

qboosh qboosh at pld-linux.org
Mon Sep 5 13:40:57 CEST 2005


Author: qboosh                       Date: Mon Sep  5 11:40:57 2005 GMT
Module: SOURCES                       Tag: RA-branch
---- Log message:
- backported to 1.1.14 (I hope)

---- Files affected:
SOURCES:
   cups-CAN-2005-2097.patch (1.1 -> 1.1.2.1) 

---- Diffs:

================================================================
Index: SOURCES/cups-CAN-2005-2097.patch
diff -u SOURCES/cups-CAN-2005-2097.patch:1.1 SOURCES/cups-CAN-2005-2097.patch:1.1.2.1
--- SOURCES/cups-CAN-2005-2097.patch:1.1	Sat Sep  3 01:32:07 2005
+++ SOURCES/cups-CAN-2005-2097.patch	Mon Sep  5 13:40:52 2005
@@ -1,21 +1,19 @@
-diff -burN cups-1.1.23.orig/pdftops/FontFile.cxx cups-1.1.23/pdftops/FontFile.cxx
---- cups-1.1.23.orig/pdftops/FontFile.cxx	2005-09-02 19:02:24.273122328 +0200
-+++ cups-1.1.23/pdftops/FontFile.cxx	2005-09-02 19:02:39.174856920 +0200
-@@ -18,6 +18,7 @@
- #include <stdarg.h>
+--- cups-1.1.14/pdftops/FontFile.cxx.orig	2001-12-07 22:02:10.000000000 +0100
++++ cups-1.1.14/pdftops/FontFile.cxx	2005-09-05 13:21:44.000000000 +0200
+@@ -15,6 +15,7 @@
+ #include <stddef.h>
  #include <string.h>
  #include <ctype.h>
 +#include <error.h>
  #include "gmem.h"
- #include "GHash.h"
  #include "Error.h"
-@@ -3572,6 +3573,9 @@
-     } else {
-       origLocaTable[i].pos = 2 * getUShort(pos + 2*i);
-     }
-+
-+    if (origLocaTable[i].pos < 0 || origLocaTable[i].pos > len)
-+      error (1, 0, "bad loca table pos value");
-   }
-   qsort(origLocaTable, nGlyphs + 1, sizeof(TrueTypeLoca), &cmpTrueTypeLocaPos);
-   for (i = 0; i < nGlyphs; ++i) {
+ #include "FontFile.h"
+@@ -2483,6 +2484,8 @@
+ 	  } else {
+ 	    list[k1] = 2 * getUShort(pos + 2*k1);
+ 	  }
++	  if (list[k1] < 0 || list[k1] > len)
++	    error (1, 0, "bad loca table pos value");
+ 	}
+ 	k1 = 0;
+ 	while (k1 < nGlyphs) {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/cups-CAN-2005-2097.patch?r1=1.1&r2=1.1.2.1&f=u




More information about the pld-cvs-commit mailing list