gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r2314 - Extractor/src/plugins/pdf


From: grothoff
Subject: [GNUnet-SVN] r2314 - Extractor/src/plugins/pdf
Date: Fri, 9 Dec 2005 11:35:19 -0800 (PST)

Author: grothoff
Date: 2005-12-09 11:35:17 -0800 (Fri, 09 Dec 2005)
New Revision: 2314

Modified:
   Extractor/src/plugins/pdf/Stream.cc
Log:
sync

Modified: Extractor/src/plugins/pdf/Stream.cc
===================================================================
--- Extractor/src/plugins/pdf/Stream.cc 2005-12-08 16:45:50 UTC (rev 2313)
+++ Extractor/src/plugins/pdf/Stream.cc 2005-12-09 19:35:17 UTC (rev 2314)
@@ -2921,9 +2921,6 @@
   if (numComps <= 0 || numComps > 4) {
     return gFalse;
   }
-  if (numComps <= 0 || numComps > 4) {
-    return gFalse;
-  }
 
   if (prec != 8) {
     error(getPos(), "Bad DCT precision %d", prec);
@@ -2951,6 +2948,9 @@
   height = read16();
   width = read16();
   numComps = str->getChar();
+  if (numComps <= 0 || numComps > 4) {
+    return gFalse;
+  }
   if (prec != 8) {
     error(getPos(), "Bad DCT precision %d", prec);
     return gFalse;
@@ -2973,6 +2973,10 @@
 
   length = read16() - 2;
   scanInfo.numComps = str->getChar();
+  if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) {
+    error(getPos(), "Bad number of components in DCT stream");
+    return gFalse;
+  }
   --length;
   if (length != 2 * scanInfo.numComps + 3) {
     error(getPos(), "Bad DCT scan info block");





reply via email to

[Prev in Thread] Current Thread [Next in Thread]