[poppler] poppler/poppler: Stream.cc,1.12,1.13

Albert Astals Cid aacid at kemper.freedesktop.org
Thu Jul 27 11:17:53 PDT 2006


Update of /cvs/poppler/poppler/poppler
In directory kemper:/tmp/cvs-serv1936/poppler

Modified Files:
	Stream.cc 
Log Message:
        * poppler/Stream.cc: If you are going to test a variable, better
        initialize it first ;-) Fixes bug 7646



Index: Stream.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/Stream.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Stream.cc	28 Feb 2006 19:59:58 -0000	1.12
+++ Stream.cc	27 Jul 2006 18:17:50 -0000	1.13
@@ -421,13 +421,13 @@
   predLine = NULL;
   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;
   }
-  nVals = width * nComps;
   totalBits = nVals * nBits;
   if (totalBits == 0 ||
       (totalBits / nBits) / nComps != width ||



More information about the poppler mailing list