[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-27 12:00:10
Message-ID: 20041027120010.C3F3816BB5 () office ! kde ! org
[Download RAW message or body]

CVS commit by goutte: 

Corrected patch: missing #include<limits.h>
(The code was already right in this branch.)


  M +28 -10    xpdf_security_integer_overflow.diff   1.1.2.2


--- koffice/filters/kword/pdf/diffs/xpdf_security_integer_overflow.diff  #1.1.2.1:1.1.2.2
@@ -3,8 +3,17 @@
 RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/Catalog.cc,v
 retrieving revision 1.1
-diff -u -p -r1.1 Catalog.cc
+retrieving revision 1.4
+diff -u -p -r1.1 -r1.4
 --- Catalog.cc  23 Nov 2002 14:15:14 -0000      1.1
-+++ Catalog.cc  27 Oct 2004 10:56:34 -0000
-@@ -63,6 +63,12 @@ Catalog::Catalog(XRef *xrefA) {
++++ Catalog.cc  27 Oct 2004 11:58:20 -0000      1.4
+@@ -13,6 +13,7 @@
+ #endif
+ 
+ #include <stddef.h>
++#include <limits.h>
+ #include "gmem.h"
+ #include "Object.h"
+ #include "XRef.h"
+@@ -63,6 +64,12 @@ Catalog::Catalog(XRef *xrefA) {
    }
    pagesSize = numPages0 = obj.getInt();
@@ -19,5 +28,5 @@
    pageRefs = (Ref *)gmalloc(pagesSize * sizeof(Ref));
    for (i = 0; i < pagesSize; ++i) {
-@@ -190,6 +196,11 @@ int Catalog::readPageTree(Dict *pagesDic
+@@ -190,6 +197,11 @@ int Catalog::readPageTree(Dict *pagesDic
        }
        if (start >= pagesSize) {
@@ -35,8 +44,17 @@
 RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/XRef.cc,v
 retrieving revision 1.1
-diff -u -p -r1.1 XRef.cc
+retrieving revision 1.4
+diff -u -p -r1.1 -r1.4
 --- XRef.cc     23 Nov 2002 14:15:14 -0000      1.1
-+++ XRef.cc     27 Oct 2004 10:56:39 -0000
-@@ -76,6 +76,12 @@ XRef::XRef(BaseStream *strA, GString *ow
++++ XRef.cc     27 Oct 2004 11:58:20 -0000      1.4
+@@ -16,6 +16,7 @@
+ #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
@@ -51,5 +69,5 @@
      for (i = 0; i < size; ++i) {
        entries[i].offset = 0xffffffff;
-@@ -267,6 +273,10 @@ GBool XRef::readXRef(Guint *pos) {
+@@ -267,6 +274,10 @@ GBool XRef::readXRef(Guint *pos) {
      // table size
      if (first + n > size) {
@@ -62,5 +80,5 @@
        for (i = size; i < newSize; ++i) {
         entries[i].offset = 0xffffffff;
-@@ -410,6 +420,10 @@ GBool XRef::constructXRef() {
+@@ -410,6 +421,10 @@ GBool XRef::constructXRef() {
             if (!strncmp(p, "obj", 3)) {
               if (num >= size) {
@@ -73,5 +91,5 @@
                             grealloc(entries, newSize * sizeof(XRefEntry));
                 for (i = size; i < newSize; ++i) {
-@@ -431,6 +445,11 @@ GBool XRef::constructXRef() {
+@@ -431,6 +446,11 @@ GBool XRef::constructXRef() {
      } else if (!strncmp(p, "endstream", 9)) {
        if (streamEndsLen == streamEndsSize) {


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