[subversion-commit] SVN tetex commit + diffs: r381 - in tetex-bin/trunk/debian: . patches

[Frank Küster]

Author: frank
Date: 2005-12-07 13:34:41 +0000 (Wed, 07 Dec 2005)
New Revision: 381

Modified:
   tetex-bin/trunk/debian/changelog
   tetex-bin/trunk/debian/patches/patch-CVE-2005-3191+2+3
Log:
fix gmalloc invocation, final version number

Modified: tetex-bin/trunk/debian/changelog
===================================================================
--- tetex-bin/trunk/debian/changelog	2005-12-07 10:00:12 UTC (rev 380)
+++ tetex-bin/trunk/debian/changelog	2005-12-07 13:34:41 UTC (rev 381)
@@ -1,4 +1,4 @@
-tetex-bin (3.0-10.2) UNRELEASED; urgency=low
+tetex-bin (3.0-11) unstable; urgency=high
 
   * Apply xpdf patch 3.01pl1 to fix vulnerabilities in the included xpdf
     code.  The patch has been modified slightly, because our code is based
@@ -26,7 +26,7 @@
     - Update Czech debconf translation, thanks to Miroslav Kure
       <kurem at upcase.inf.upol.cz> (closes: #341940) [frank]
 
- -- Frank Küster <frank at debian.org>  Wed,  7 Dec 2005 10:59:37 +0100
+ -- Frank Küster <frank at debian.org>  Wed,  7 Dec 2005 14:34:12 +0100
 
 tetex-bin (3.0-10.1) unstable; urgency=low
 

Modified: tetex-bin/trunk/debian/patches/patch-CVE-2005-3191+2+3
===================================================================
--- tetex-bin/trunk/debian/patches/patch-CVE-2005-3191+2+3	2005-12-07 10:00:12 UTC (rev 380)
+++ tetex-bin/trunk/debian/patches/patch-CVE-2005-3191+2+3	2005-12-07 13:34:41 UTC (rev 381)
@@ -1,7 +1,7 @@
 Index: tetex-bin-3.0/libs/xpdf/xpdf/Stream.h
 ===================================================================
---- tetex-bin-3.0.orig/libs/xpdf/xpdf/Stream.h	2005-12-07 10:50:44.000000000 +0100
-+++ tetex-bin-3.0/libs/xpdf/xpdf/Stream.h	2005-12-07 10:52:53.000000000 +0100
+--- tetex-bin-3.0.orig/libs/xpdf/xpdf/Stream.h	2005-12-07 13:48:05.000000000 +0100
++++ tetex-bin-3.0/libs/xpdf/xpdf/Stream.h	2005-12-07 14:07:25.000000000 +0100
 @@ -233,6 +233,8 @@
  
    ~StreamPredictor();
@@ -21,8 +21,8 @@
  //------------------------------------------------------------------------
 Index: tetex-bin-3.0/libs/xpdf/xpdf/Stream.cc
 ===================================================================
---- tetex-bin-3.0.orig/libs/xpdf/xpdf/Stream.cc	2005-12-07 10:50:44.000000000 +0100
-+++ tetex-bin-3.0/libs/xpdf/xpdf/Stream.cc	2005-12-07 10:52:53.000000000 +0100
+--- tetex-bin-3.0.orig/libs/xpdf/xpdf/Stream.cc	2005-12-07 13:48:05.000000000 +0100
++++ tetex-bin-3.0/libs/xpdf/xpdf/Stream.cc	2005-12-07 14:07:25.000000000 +0100
 @@ -407,18 +407,33 @@
  
  StreamPredictor::StreamPredictor(Stream *strA, int predictorA,
@@ -97,8 +97,8 @@
    }
 Index: tetex-bin-3.0/libs/xpdf/xpdf/JPXStream.cc
 ===================================================================
---- tetex-bin-3.0.orig/libs/xpdf/xpdf/JPXStream.cc	2005-12-07 10:50:44.000000000 +0100
-+++ tetex-bin-3.0/libs/xpdf/xpdf/JPXStream.cc	2005-12-07 10:53:13.000000000 +0100
+--- tetex-bin-3.0.orig/libs/xpdf/xpdf/JPXStream.cc	2005-12-07 13:48:05.000000000 +0100
++++ tetex-bin-3.0/libs/xpdf/xpdf/JPXStream.cc	2005-12-07 14:09:40.000000000 +0100
 @@ -666,7 +666,7 @@
    int segType;
    GBool haveSIZ, haveCOD, haveQCD, haveSOT;
@@ -120,7 +120,7 @@
 +	error(getPos(), "Bad tile count in JPX SIZ marker segment");
 +	return gFalse;
 +      }
-+      img.tiles = (JPXTile *)gmalloc(nTiles, sizeof(JPXTile));
++      img.tiles = (JPXTile *)gmalloc(nTiles * sizeof(JPXTile));
        for (i = 0; i < img.nXTiles * img.nYTiles; ++i) {
  	img.tiles[i].tileComps = (JPXTileComp *)gmalloc(img.nComps *
  							sizeof(JPXTileComp));