Attachment 24853 Details for Bug 58082

[patch] additional patch for xpdf2 issues moved to xpdf3

xpdf-CESA-2004-007-xpdf3.diff (text/plain), 3.47 KB, created by Sebastian Krahmer on 2004-10-11 21:03:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sebastian Krahmer

Created: 2004-10-11 21:03:04 UTC

Size: 3.47 KB

patch

obsolete

>--- XRef.cc.orig	2004-10-11 14:01:01.000000000 +0200
>+++ XRef.cc	2004-10-11 14:35:20.000000000 +0200
>@@ -107,6 +107,10 @@
>   first = obj1.getInt();
>   obj1.free();
> 
>+  if (nObjects*sizeof(int)/sizeof(int) != nObjects) {
>+    error(-1, "Invalid 'nObjects'");
>+    goto err1;
>+  }
>   objs = new Object[nObjects];
>   objNums = (int *)gmalloc(nObjects * sizeof(int));
>   offsets = (int *)gmalloc(nObjects * sizeof(int));
>@@ -373,6 +377,10 @@
>       for (newSize = size ? 2 * size : 1024;
> 	   first + n > newSize;
> 	   newSize <<= 1) ;
>+      if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
>+        error(-1, "Invalid 'obj' parameters'");
>+        return gFalse;
>+      }
>       entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry));
>       for (i = size; i < newSize; ++i) {
> 	entries[i].offset = 0xffffffff;
>@@ -475,6 +483,10 @@
>   newSize = obj.getInt();
>   obj.free();
>   if (newSize > size) {
>+    if (newSize * sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
>+      error(-1, "Invalid 'size' parameter.");
>+      return gFalse;
>+    }
>     entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry));
>     for (i = size; i < newSize; ++i) {
>       entries[i].offset = 0xffffffff;
>@@ -555,6 +567,10 @@
>     for (newSize = size ? 2 * size : 1024;
> 	 first + n > newSize;
> 	 newSize <<= 1) ;
>+    if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
>+      error(-1, "Invalid 'size' inside xref table.");
>+      return gFalse;
>+    }
>     entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry));
>     for (i = size; i < newSize; ++i) {
>       entries[i].offset = 0xffffffff;
>@@ -683,6 +699,10 @@
> 	    if (!strncmp(p, "obj", 3)) {
> 	      if (num >= size) {
> 		newSize = (num + 1 + 255) & ~255;
>+                if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
>+                  error(-1, "Invalid 'obj' parameters.");
>+                  return gFalse;
>+                }
> 		entries = (XRefEntry *)
> 		            grealloc(entries, newSize * sizeof(XRefEntry));
> 		for (i = size; i < newSize; ++i) {
>@@ -705,6 +725,10 @@
>     } else if (!strncmp(p, "endstream", 9)) {
>       if (streamEndsLen == streamEndsSize) {
> 	streamEndsSize += 64;
>+        if (streamEndsSize*sizeof(int)/sizeof(int) != streamEndsSize) {
>+          error(-1, "Invalid 'endstream' parameter.");
>+          return gFalse;
>+        }
> 	streamEnds = (Guint *)grealloc(streamEnds,
> 				       streamEndsSize * sizeof(int));
>       }
>--- Catalog.cc.orig	2004-10-11 14:00:52.000000000 +0200
>+++ Catalog.cc	2004-10-11 14:24:09.000000000 +0200
>@@ -64,6 +64,15 @@
>   }
>   pagesSize = numPages0 = (int)obj.getNum();
>   obj.free();
>+  // 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) {
>+    error(-1, "Invalid 'pagesSize'");
>+    ok = gFalse;
>+    return;
>+  }
>+
>   pages = (Page **)gmalloc(pagesSize * sizeof(Page *));
>   pageRefs = (Ref *)gmalloc(pagesSize * sizeof(Ref));
>   for (i = 0; i < pagesSize; ++i) {
>@@ -191,6 +200,10 @@
>       }
>       if (start >= pagesSize) {
> 	pagesSize += 32;
>+        if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize) {
>+          error(-1, "Invalid 'pagesSize' parameter.");
>+          goto err3;
>+        }
> 	pages = (Page **)grealloc(pages, pagesSize * sizeof(Page *));
> 	pageRefs = (Ref *)grealloc(pageRefs, pagesSize * sizeof(Ref));
> 	for (j = pagesSize - 32; j < pagesSize; ++j) {

Actions: View | Diff

Attachments on bug 58082: 22235 | 22236 | 23223 | 24853 | 24858 | 25136 | 25139 | 25625 | 25633