Attachment 88582 Details for Bug 70854 – The said patch

[patch] The said patch

Q (text/plain), 2.92 KB, created by Albert Astals Cid on 2013-11-03 22:32:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Albert Astals Cid

Created: 2013-11-03 22:32:31 UTC

Size: 2.92 KB

patch

obsolete

>diff --git a/poppler/Lexer.cc b/poppler/Lexer.cc
>index bd7546f..55f8e48 100644
>--- a/poppler/Lexer.cc
>+++ b/poppler/Lexer.cc
>@@ -581,7 +581,7 @@ Object *Lexer::getObj(Object *obj, int objNum) {
>   return obj;
> }
> 
>-Object *Lexer::getObj(Object *obj, const char *cmdA) {
>+Object *Lexer::getObj(Object *obj, const char *cmdA, int objNum) {
>   char *p;
>   int c;
>   GBool comment;
>@@ -591,7 +591,7 @@ Object *Lexer::getObj(Object *obj, const char *cmdA) {
>   comment = gFalse;
>   const char *cmd1 = tokBuf;
>   *tokBuf = 0;
>-  while (strcmp(cmdA, cmd1)) {
>+  while (strcmp(cmdA, cmd1) && (objNum < 0 || xref->getNumEntry(getPos()) == objNum)) {
>     while (1) {
>       if ((c = getChar()) == EOF) {
>         return obj->initEOF();
>diff --git a/poppler/Lexer.h b/poppler/Lexer.h
>index d9c23dc..8a14c6b 100644
>--- a/poppler/Lexer.h
>+++ b/poppler/Lexer.h
>@@ -57,7 +57,7 @@ public:
> 
>   // Get the next object from the input stream.
>   Object *getObj(Object *obj, int objNum = -1);
>-  Object *getObj(Object *obj, const char *cmdA);
>+  Object *getObj(Object *obj, const char *cmdA, int objNum);
> 
>   // 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 0370564..6f83c84 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("endstream");  // kill 'stream'
>+  shift("endstream", objNum);  // kill 'stream'
>   if (buf1.isCmd("endstream")) {
>     shift();
>   } else {
>@@ -250,9 +250,6 @@ 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("endstream");
>-      }
>       length = lexer->getPos() - pos;
>       if (buf1.isCmd("endstream")) {
>         obj.initInt64(length);
>@@ -303,7 +300,7 @@ void Parser::shift(int objNum) {
>     lexer->getObj(&buf2, objNum);
> }
> 
>-void Parser::shift(const char *cmdA) {
>+void Parser::shift(const char *cmdA, int objNum) {
>   if (inlineImg > 0) {
>     if (inlineImg < 2) {
>       ++inlineImg;
>@@ -321,8 +318,8 @@ void Parser::shift(const char *cmdA) {
>   if (inlineImg > 0) {
>     buf2.initNull();
>   } else if (buf1.isCmd(cmdA)) {
>-    lexer->getObj(&buf2, -1);
>+    lexer->getObj(&buf2, objNum);
>   } else {
>-    lexer->getObj(&buf2, cmdA);
>+    lexer->getObj(&buf2, cmdA, objNum);
>   }
> }
>diff --git a/poppler/Parser.h b/poppler/Parser.h
>index 9702716..d86e511 100644
>--- a/poppler/Parser.h
>+++ b/poppler/Parser.h
>@@ -75,7 +75,7 @@ private:
> 		     int objNum, int objGen, int recursion,
> 		     GBool strict);
>   void shift(int objNum = -1);
>-  void shift(const char *cmdA);
>+  void shift(const char *cmdA, int objNum);
> };
> 
> #endif

Actions: View | Splinter Review

Attachments on bug 70854: 88098 | 88582

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.