Attachment 77269 Details for Bug 62985 – endstream detection and scanSpecialFlags correction

[patch] endstream detection and scanSpecialFlags correction

streamenddetect.patch (text/plain), 4.11 KB, created by Thomas Freitag on 2013-04-01 09:10:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Freitag

Created: 2013-04-01 09:10:47 UTC

Size: 4.11 KB

patch

obsolete

>diff --git a/poppler/Lexer.cc b/poppler/Lexer.cc
>index a0bb35e..50eda31 100644
>--- a/poppler/Lexer.cc
>+++ b/poppler/Lexer.cc
>@@ -580,6 +580,50 @@ Object *Lexer::getObj(Object *obj, int objNum) {
>   return obj;
> }
> 
>+Object *Lexer::getObj(Object *obj, const char *cmdA) {
>+  char *p;
>+  int c, c2;
>+  GBool comment, done;
>+  int numParen;
>+  GooString *s;
>+  int n, m;
>+
>+  // skip whitespace and comments
>+  comment = gFalse;
>+  const char *cmd1 = tokBuf;
>+  *tokBuf = 0;
>+  while (strcmp(cmdA, cmd1)) {
>+    while (1) {
>+      if ((c = getChar()) == EOF) {
>+        return obj->initEOF();
>+      }
>+      if (comment) {
>+        if (c == '\r' || c == '\n') {
>+          comment = gFalse;
>+        }
>+      } else if (c == '%') {
>+        comment = gTrue;
>+      } else if (specialChars[c] != 1) {
>+        break;
>+      }
>+    }
>+    p = tokBuf;
>+    *p++ = c;
>+    n = 1;
>+    while ((c = lookChar()) != EOF && specialChars[c] == 0) {
>+      getChar();
>+      if (++n == tokBufSize) {
>+        break;
>+      }
>+      *p++ = c;
>+    }
>+    *p = '\0';
>+  }
>+  obj->initCmd(tokBuf);
>+  
>+  return obj;
>+}
>+
> void Lexer::skipToNextLine() {
>   int c;
> 
>diff --git a/poppler/Lexer.h b/poppler/Lexer.h
>index 227508f..24ad10d 100644
>--- a/poppler/Lexer.h
>+++ b/poppler/Lexer.h
>@@ -56,6 +56,7 @@ public:
> 
>   // Get the next object from the input stream.
>   Object *getObj(Object *obj, int objNum = -1);
>+  Object *getObj(Object *obj, const char *cmdA);
> 
>   // Skip to the beginning of the next line in the input stream.
>   void skipToNextLine();
>diff --git a/poppler/Parser.cc b/poppler/Parser.cc
>index b66203f..8661bb2 100644
>--- a/poppler/Parser.cc
>+++ b/poppler/Parser.cc
>@@ -242,7 +242,7 @@ Stream *Parser::makeStream(Object *dict, Guchar *fileKey,
> 
>   // refill token buffers and check for 'endstream'
>   shift();  // kill '>>'
>-  shift();  // kill 'stream'
>+  shift("endstream");  // kill 'stream'
>   if (buf1.isCmd("endstream")) {
>     shift();
>   } else {
>@@ -250,8 +250,8 @@ Stream *Parser::makeStream(Object *dict, Guchar *fileKey,
>     if (strict) return NULL;
>     if (xref) {
>       // shift until we find the proper endstream or we change to another object or reach eof
>-      while (!buf1.isCmd("endstream") && xref->getNumEntry(lexer->getPos()) == objNum && !buf1.isEOF()) {
>-        shift();
>+      while (!buf1.isCmd("endstream") && xref->getNumEntry(lexer->getPos()) == objNum && !buf1.isEOF()) {
>+        shift("endstream");
>       }
>       length = lexer->getPos() - pos;
>       if (buf1.isCmd("endstream")) {
>@@ -302,3 +302,27 @@ void Parser::shift(int objNum) {
>   else
>     lexer->getObj(&buf2, objNum);
> }
>+
>+void Parser::shift(const char *cmdA) {
>+  if (inlineImg > 0) {
>+    if (inlineImg < 2) {
>+      ++inlineImg;
>+    } else {
>+      // in a damaged content stream, if 'ID' shows up in the middle
>+      // of a dictionary, we need to reset
>+      inlineImg = 0;
>+    }
>+  } else if (buf2.isCmd("ID")) {
>+    lexer->skipChar();		// skip char after 'ID' command
>+    inlineImg = 1;
>+  }
>+  buf1.free();
>+  buf2.shallowCopy(&buf1);
>+  if (inlineImg > 0) {
>+    buf2.initNull();
>+  } else if (buf1.isCmd(cmdA)) {
>+    lexer->getObj(&buf2, -1);
>+  } else {
>+    lexer->getObj(&buf2, cmdA);
>+  }
>+}
>diff --git a/poppler/Parser.h b/poppler/Parser.h
>index adaf913..77282fc 100644
>--- a/poppler/Parser.h
>+++ b/poppler/Parser.h
>@@ -74,6 +74,7 @@ private:
> 		     int objNum, int objGen, int recursion,
> 		     GBool strict);
>   void shift(int objNum = -1);
>+  void shift(const char *cmdA);
> };
> 
> #endif
>diff --git a/poppler/XRef.cc b/poppler/XRef.cc
>index 109917a..3351993 100644
>--- a/poppler/XRef.cc
>+++ b/poppler/XRef.cc
>@@ -1672,8 +1672,10 @@ void XRef::scanSpecialFlags() {
>   // tables/streams, even those that had already been parsed
>   prevXRefOffset = mainXRefOffset;
> 
>-  std::vector<int> xrefStreamObjNums;
>-  readXRefUntil(-1 /* read all xref sections */, &xrefStreamObjNums);
>+  std::vector<int> xrefStreamObjNums;
>+  if (!streamEndsLen) { // don't do it for already reconstructed xref
>+    readXRefUntil(-1 /* read all xref sections */, &xrefStreamObjNums);
>+  }
> 
>   // Mark object streams as DontRewrite, because we write each object
>   // individually in full rewrite mode.

Actions: View | Splinter Review

Attachments on bug 62985: 77269

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.