[Frugalware-darcs] frugalware-0.6: poppler-0.5.4-3terminus1-i686

voroskoi voroskoi at frugalware.org
Mon Sep 3 20:55:09 CEST 2007


Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070903184804-dd049-bf7abc44954ab78512dc5e6631c4b01596a4c0c8.gz;

[poppler-0.5.4-3terminus1-i686
voroskoi <voroskoi at frugalware.org>**20070903184804
 secfix relbump, closes #2300
] {
addfile ./source/xlib/poppler/100_streampredictor_overflow.patch.diff
hunk ./source/xlib/poppler/100_streampredictor_overflow.patch.diff 1
+diff -Nur poppler-0.5.4/poppler/Stream.cc poppler-0.5.4.new/poppler/Stream.cc
+--- poppler-0.5.4/poppler/Stream.cc	2006-07-28 11:07:41.000000000 -0700
++++ poppler-0.5.4.new/poppler/Stream.cc	2007-08-07 11:29:59.854631893 -0700
+@@ -422,21 +422,14 @@
+   ok = gFalse;
+ 
+   nVals = width * nComps;
+-  if (width <= 0 || nComps <= 0 || nBits <= 0 ||
+-      nComps >= INT_MAX/nBits ||
+-      width >= INT_MAX/nComps/nBits ||
+-      nVals * nBits + 7 < 0) {
+-    return;
+-  }
+-  totalBits = nVals * nBits;
+-  if (totalBits == 0 ||
+-      (totalBits / nBits) / nComps != width ||
+-      totalBits + 7 < 0) {
+-    return;
+-  }
+   pixBytes = (nComps * nBits + 7) >> 3;
+-  rowBytes = ((totalBits + 7) >> 3) + pixBytes;
+-  if (rowBytes < 0) {
++  rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
++  if (width <= 0 || nComps <= 0 || nBits <= 0 ||
++      nComps > gfxColorMaxComps ||
++      nBits > 16 ||
++      nVals <= 0 ||
++      nVals * nBits + 7 <= 0 ||
++      rowBytes <= 0) {
+     return;
+   }
+   predLine = (Guchar *)gmalloc(rowBytes);
hunk ./source/xlib/poppler/FrugalBuild 6
-pkgrel=2
+pkgrel=3terminus1
hunk ./source/xlib/poppler/FrugalBuild 15
-	01-poppler.conf MOAB-06-01-2007.diff)
+	01-poppler.conf MOAB-06-01-2007.diff 100_streampredictor_overflow.patch.diff)
hunk ./source/xlib/poppler/FrugalBuild 42
+sha1sums=('edf4e4ff17ef86a7f60f097949ad7db53fa2c3b1' \
+          'a048348d9a8c6d545714350d3ab66dc7028e4b7f' \
+          '3b026ffef9cf8c1c273077c3282d70938c7b5a4b' \
+          '7179b5d4b0240e528150a471e54c219446dfc012')
hunk ./source/xlib/poppler/FrugalBuild 47
-sha1sums=('edf4e4ff17ef86a7f60f097949ad7db53fa2c3b1'\
-          'a048348d9a8c6d545714350d3ab66dc7028e4b7f'\
-          '3b026ffef9cf8c1c273077c3282d70938c7b5a4b')
}


More information about the Frugalware-darcs mailing list