Attachment 122276 Details for Bug 92508 – Call constructXRef if necessary xref can't be fetched

[patch] Call constructXRef if necessary xref can't be fetched

92508-new.patch (text/plain), 1.04 KB, created by Thomas Freitag on 2016-03-14 13:57:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Freitag

Created: 2016-03-14 13:57:17 UTC

Size: 1.04 KB

patch

obsolete

>diff --git a/poppler/XRef.cc b/poppler/XRef.cc
>index 1bbbdc5..be71348 100644
>--- a/poppler/XRef.cc
>+++ b/poppler/XRef.cc
>@@ -297,6 +297,7 @@ void XRef::init() {
>   ownerPasswordOk = gFalse;
>   rootNum = -1;
>   strOwner = gFalse;
>+  xrefReconstructed = gFalse;
> }
> 
> XRef::XRef() {
>@@ -1249,6 +1250,11 @@ Object *XRef::fetch(int num, int gen, Object *obj, int recursion) {
>   return obj;
> 
>  err:
>+  if (!xrefReconstructed) {
>+    rootNum = -1;
>+    constructXRef(&xrefReconstructed);
>+    return fetch(num, gen, obj, ++recursion);
>+  }
>   return obj->initNull();
> }
> 
>diff --git a/poppler/XRef.h b/poppler/XRef.h
>index 70065d8..56231ef 100644
>--- a/poppler/XRef.h
>+++ b/poppler/XRef.h
>@@ -201,6 +201,7 @@ private:
>   int rootNum, rootGen;		// catalog dict
>   GBool ok;			// true if xref table is valid
>   int errCode;			// error code (if <ok> is false)
>+  GBool xrefReconstructed;	// marker, true if xref was already reconstructed
>   Object trailerDict;		// trailer dictionary
>   Goffset *streamEnds;		// 'endstream' positions - only used in
> 				//   damaged files

Actions: View | Splinter Review

Attachments on bug 92508: 118937 | 122276 | 122325

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.