Attachment 121323 Details for Bug 93882 – Mark holes in xref table as free entries

Mark holes in xref table as free entries

0001-Mark-holes-in-xref-table-as-free.patch (text/plain), 3.61 KB, created by Marek Kasik on 2016-01-27 10:45:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marek Kasik

Created: 2016-01-27 10:45:09 UTC

Size: 3.61 KB

patch

obsolete

>From 44b6dd92420dbf06e755e9cd1866997fd693abd0 Mon Sep 17 00:00:00 2001
>From: Marek Kasik <mkasik@redhat.com>
>Date: Wed, 27 Jan 2016 11:43:59 +0100
>Subject: [PATCH] Mark holes in xref table as free entries
>
>Mark newly added entries which where not listed in previous sections of xref
>table as free. Don't do this if previous size of the xref table was 0 because
>this indicates that the PDF is probably linearized and it would mark some
>entries as free even if those will be populated later.
>---
> poppler/XRef.cc | 21 ++++++++++++++-------
> poppler/XRef.h  |  2 +-
> 2 files changed, 15 insertions(+), 8 deletions(-)
>
>diff --git a/poppler/XRef.cc b/poppler/XRef.cc
>index 1bbbdc5..4acc6f5 100644
>--- a/poppler/XRef.cc
>+++ b/poppler/XRef.cc
>@@ -357,7 +357,7 @@ XRef::XRef(BaseStream *strA, Goffset pos, Goffset mainXRefEntriesOffsetA, GBool
>         error(errSyntaxWarning, -1, "No valid XRef size in trailer");
>     } else {
>       if (obj.getInt() > size) {
>-         if (resize(obj.getInt()) != obj.getInt()) {
>+         if (resize(0, obj.getInt()) != obj.getInt()) {
>             if (!(ok = constructXRef(wasReconstructed))) {
>                obj.free();
>                errCode = errDamaged;
>@@ -482,15 +482,22 @@ int XRef::reserve(int newSize)
>   return capacity;
> }
> 
>-int XRef::resize(int newSize)
>+int XRef::resize(int first, int n)
> {
>+  int newSize;
>+
>+  newSize = first + n;
>+
>   if (newSize > size) {
> 
>     if (reserve(newSize) < newSize) return size;
> 
>     for (int i = size; i < newSize; ++i) {
>       entries[i].offset = -1;
>-      entries[i].type = xrefEntryNone;
>+      if (i < first && size != 0)
>+        entries[i].type = xrefEntryFree;
>+      else
>+        entries[i].type = xrefEntryNone;
>       entries[i].obj.initNull ();
>       entries[i].flags = 0;
>       entries[i].gen = 0;
>@@ -602,7 +609,7 @@ GBool XRef::readXRefTable(Parser *parser, Goffset *pos, std::vector<Goffset> *fo
>       goto err0;
>     }
>     if (first + n > size) {
>-      if (resize(first + n) != first + n) {
>+      if (resize(first, n) != first + n) {
>         error(errSyntaxError, -1, "Invalid 'obj' parameters'");
>         goto err0;
>       }
>@@ -740,7 +747,7 @@ GBool XRef::readXRefStream(Stream *xrefStr, Goffset *pos) {
>     goto err1;
>   }
>   if (newSize > size) {
>-    if (resize(newSize) != newSize) {
>+    if (resize(0, newSize) != newSize) {
>       error(errSyntaxError, -1, "Invalid 'size' parameter");
>       goto err0;
>     }
>@@ -828,7 +835,7 @@ GBool XRef::readXRefStreamSection(Stream *xrefStr, int *w, int first, int n) {
>     return gFalse;
>   }
>   if (first + n > size) {
>-    if (resize(first + n) != size) {
>+    if (resize(first, n) != size) {
>       error(errSyntaxError, -1, "Invalid 'size' inside xref table");
>       return gFalse;
>     }
>@@ -992,7 +999,7 @@ GBool XRef::constructXRef(GBool *wasReconstructed, GBool needCatalogDict) {
> 		    error(errSyntaxError, -1, "Bad object number");
> 		    return gFalse;
> 		  }
>-		    if (resize(newSize) != newSize) {
>+		    if (resize(0, newSize) != newSize) {
> 		      error(errSyntaxError, -1, "Invalid 'obj' parameters");
> 		      return gFalse;
> 		    }
>diff --git a/poppler/XRef.h b/poppler/XRef.h
>index 70065d8..a30dee7 100644
>--- a/poppler/XRef.h
>+++ b/poppler/XRef.h
>@@ -226,7 +226,7 @@ private:
> 
>   void init();
>   int reserve(int newSize);
>-  int resize(int newSize);
>+  int resize(int first, int n);
>   GBool readXRef(Goffset *pos, std::vector<Goffset> *followedXRefStm, std::vector<int> *xrefStreamObjsNum);
>   GBool readXRefTable(Parser *parser, Goffset *pos, std::vector<Goffset> *followedXRefStm, std::vector<int> *xrefStreamObjsNum);
>   GBool readXRefStreamSection(Stream *xrefStr, int *w, int first, int n);
>-- 
>2.5.0
>

Actions: View

Attachments on bug 93882: 121323

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.