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

List:       kde-commits
Subject:    KOFFICE_1_3_BRANCH: koffice/filters/kword/pdf/diffs
From:       Nicolas Goutte <nicolasg () snafu ! de>
Date:       2004-10-30 16:07:32
Message-ID: 20041030160732.1053516B81 () office ! kde ! org
[Download RAW message or body]

CVS commit by goutte: 

Fix signed/unsigned mismatch


  M +23 -23    xpdf_security_integer_overflow.diff   1.1.2.3


--- koffice/filters/kword/pdf/diffs/xpdf_security_integer_overflow.diff  #1.1.2.2:1.1.2.3
@@ -3,22 +3,22 @@
 RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/Catalog.cc,v
 retrieving revision 1.1
-retrieving revision 1.4
-diff -u -p -r1.1 -r1.4
+retrieving revision 1.5
+diff -u -p -r1.1 -r1.5
 --- Catalog.cc  23 Nov 2002 14:15:14 -0000      1.1
-+++ Catalog.cc  27 Oct 2004 11:58:20 -0000      1.4
-@@ -13,6 +13,7 @@
++++ Catalog.cc  30 Oct 2004 16:02:29 -0000      1.5
+@@ -12,6 +12,7 @@
+ #pragma implementation
  #endif
  
- #include <stddef.h>
 +#include <limits.h>
+ #include <stddef.h>
  #include "gmem.h"
  #include "Object.h"
- #include "XRef.h"
 @@ -63,6 +64,12 @@ Catalog::Catalog(XRef *xrefA) {
    }
    pagesSize = numPages0 = obj.getInt();
    obj.free();
-+  if ((pagesSize >= INT_MAX / sizeof(Page *)) ||
-+      (pagesSize >= INT_MAX / sizeof(Ref))) {
++  if (pagesSize >= INT_MAX / (signed) sizeof(Page *) ||
++      pagesSize >= INT_MAX / (signed) sizeof(Ref)) {
 +    error(-1, "Invalid 'pagesSize'");
 +    ok = gFalse;
@@ -32,6 +32,6 @@
        if (start >= pagesSize) {
         pagesSize += 32;
-+        if ((pagesSize >= INT_MAX / sizeof(Page *)) ||
-+            (pagesSize >= INT_MAX / sizeof(Ref))) {
++        if (pagesSize >= INT_MAX / (signed) sizeof(Page *) ||
++            pagesSize >= INT_MAX / (signed) sizeof(Ref)) {
 +          error(-1, "Invalid 'pagesSize' parameter.");
 +          goto err3;
@@ -44,21 +44,21 @@
 RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/XRef.cc,v
 retrieving revision 1.1
-retrieving revision 1.4
-diff -u -p -r1.1 -r1.4
+retrieving revision 1.5
+diff -u -p -r1.1 -r1.5
 --- XRef.cc     23 Nov 2002 14:15:14 -0000      1.1
-+++ XRef.cc     27 Oct 2004 11:58:20 -0000      1.4
-@@ -16,6 +16,7 @@
++++ XRef.cc     30 Oct 2004 16:02:29 -0000      1.5
+@@ -12,6 +12,7 @@
+ #pragma implementation
+ #endif
+ 
++#include <limits.h>
+ #include <stdlib.h>
  #include <stddef.h>
  #include <string.h>
- #include <ctype.h>
-+#include <limits.h>
- #include "gmem.h"
- #include "Object.h"
- #include "Stream.h"
 @@ -76,6 +77,12 @@ XRef::XRef(BaseStream *strA, GString *ow
  
    // trailer is ok - read the xref table
    } else {
-+    if (size >= INT_MAX / sizeof(XRefEntry)) {
++    if (size >= INT_MAX / (signed) sizeof(XRefEntry)) {
 +      error(-1, "Invalid 'size' inside xref table.");
 +      ok = gFalse;
@@ -73,5 +73,5 @@
      if (first + n > size) {
        newSize = size + 256;
-+      if (newSize >= INT_MAX / sizeof(XRefEntry)) {
++      if (newSize >= INT_MAX / (signed) sizeof(XRefEntry)) {
 +        error(-1, "Invalid 'newSize'");
 +        goto err2;
@@ -84,5 +84,5 @@
               if (num >= size) {
                 newSize = (num + 1 + 255) & ~255;
-+               if (newSize >= INT_MAX / sizeof(XRefEntry)) {
++               if (newSize >= INT_MAX / (signed) sizeof(XRefEntry)) {
 +                 error(-1, "Invalid 'obj' parameters.");
 +                 return gFalse;
@@ -95,5 +95,5 @@
        if (streamEndsLen == streamEndsSize) {
         streamEndsSize += 64;
-+        if (streamEndsSize >= INT_MAX / sizeof(int)) {
++        if (streamEndsSize >= INT_MAX / (signed) sizeof(int)) {
 +          error(-1, "Invalid 'endstream' parameter.");
 +          return gFalse;


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