[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdegraphics/kpdf/xpdf
From:       Albert Astals Cid <tsdgeos () terra ! es>
Date:       2004-10-22 21:37:33
Message-ID: 20041022213733.7D10616C5C () office ! kde ! org
[Download RAW message or body]

CVS commit by aacid: 

Remove warnings caused by the overflow checks. Aprroved by Dirk Mueller from security team


  M +4 -4      Catalog.cc   1.6
  M +6 -6      XRef.cc   1.6


--- kdegraphics/kpdf/xpdf/Catalog.cc  #1.5:1.6
@@ -67,6 +67,6 @@ Catalog::Catalog(XRef *xrefA) {
   // The gcc doesnt optimize this away, so this check is ok,
   // even if it looks like a pagesSize != pagesSize check
-  if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize ||
-      pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) {
+  if (pagesSize*sizeof(Page *)/sizeof(Page *) != (unsigned int)pagesSize ||
+      pagesSize*sizeof(Ref)/sizeof(Ref) != (unsigned int)pagesSize) {
     error(-1, "Invalid 'pagesSize'");
     ok = gFalse;
@@ -201,6 +201,6 @@ int Catalog::readPageTree(Dict *pagesDic
       if (start >= pagesSize) {
         pagesSize += 32;
-        if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize ||
-            pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) {
+        if (pagesSize*sizeof(Page *)/sizeof(Page *) != (unsigned int)pagesSize ||
+            pagesSize*sizeof(Ref)/sizeof(Ref) != (unsigned int)pagesSize) {
           error(-1, "Invalid 'pagesSize' parameter.");
           goto err3;

--- kdegraphics/kpdf/xpdf/XRef.cc  #1.5:1.6
@@ -111,5 +111,5 @@ ObjectStream::ObjectStream(XRef *xref, i
   }
 
-  if (nObjects*sizeof(int)/sizeof(int) != nObjects) {
+  if (nObjects*sizeof(int)/sizeof(int) != (uint)nObjects) {
     error(-1, "Invalid 'nObjects'");
     goto err1;
@@ -394,5 +394,5 @@ GBool XRef::readXRefTable(Parser *parser
         goto err1;
       }
-      if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
+      if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != (uint)newSize) {
         error(-1, "Invalid 'obj' parameters'");
         goto err1;
@@ -504,5 +504,5 @@ GBool XRef::readXRefStream(Stream *xrefS
   }
   if (newSize > size) {
-    if (newSize * sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
+    if (newSize * sizeof(XRefEntry)/sizeof(XRefEntry) != (uint)newSize) {
       error(-1, "Invalid 'size' parameter.");
       return gFalse;
@@ -598,5 +598,5 @@ GBool XRef::readXRefStreamSection(Stream
       return gFalse;
     }
-    if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
+    if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != (uint)newSize) {
       error(-1, "Invalid 'size' inside xref table.");
       return gFalse;
@@ -737,5 +737,5 @@ GBool XRef::constructXRef() {
                     return gFalse;
                   }
-                  if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
+                  if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != (uint)newSize) {
                     error(-1, "Invalid 'obj' parameters.");
                     return gFalse;
@@ -764,5 +764,5 @@ GBool XRef::constructXRef() {
       if (streamEndsLen == streamEndsSize) {
         streamEndsSize += 64;
-        if (streamEndsSize*sizeof(int)/sizeof(int) != streamEndsSize) {
+        if (streamEndsSize*sizeof(int)/sizeof(int) != (uint)streamEndsSize) {
           error(-1, "Invalid 'endstream' parameter.");
           return gFalse;


[prev in list] [next in list] [prev in thread] [next in thread]