Attachment 122699 Details for Bug 94756 – Allow newlines in '<num> <gen> obj' sequence

[patch] Allow newlines in '<num> <gen> obj' sequence

94756.patch (text/plain), 1.37 KB, created by Thomas Freitag on 2016-04-04 12:11:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Freitag

Created: 2016-04-04 12:11:19 UTC

Size: 1.37 KB

patch

obsolete

>diff --git a/poppler/XRef.cc b/poppler/XRef.cc
>index 76ffc6f..3d032bc 100644
>--- a/poppler/XRef.cc
>+++ b/poppler/XRef.cc
>@@ -973,7 +973,12 @@ GBool XRef::constructXRef(GBool *wasReconstructed, GBool needCatalogDict) {
> 	do {
> 	  ++p;
> 	} while (*p && isdigit(*p & 0xff));
>-	if (isspace(*p & 0xff)) {
>+	if ((*p & 0xff) == 0 || isspace(*p & 0xff)) {
>+          if ((*p & 0xff) == 0) {
>+            //new line, continue with next line!
>+            str->getLine(buf, 256);
>+            p = buf - 1;
>+          }
> 	  do {
> 	    ++p;
> 	  } while (*p && isspace(*p & 0xff));
>@@ -982,7 +987,12 @@ GBool XRef::constructXRef(GBool *wasReconstructed, GBool needCatalogDict) {
> 	    do {
> 	      ++p;
> 	    } while (*p && isdigit(*p & 0xff));
>-	    if (isspace(*p & 0xff)) {
>+	    if ((*p & 0xff) == 0 || isspace(*p & 0xff)) {
>+              if ((*p & 0xff) == 0) {
>+                //new line, continue with next line!
>+                str->getLine(buf, 256);
>+                p = buf - 1;
>+              }
> 	      do {
> 		++p;
> 	      } while (*p && isspace(*p & 0xff));
>@@ -1251,6 +1261,7 @@ Object *XRef::fetch(int num, int gen, Object *obj, int recursion) {
> 
>  err:
>   if (!xRefStream && !xrefReconstructed) {
>+    error(errInternal, -1, "xref num {0:d} not found but needed, try to reconstruct\n", num);
>     rootNum = -1;
>     constructXRef(&xrefReconstructed);
>     return fetch(num, gen, obj, ++recursion);

Actions: View | Splinter Review

Attachments on bug 94756: 122650 | 122699

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.