Make inline image token exactly contain the image data

Do not include the trailing EI, and handle cases where EI is not
preceded by a delimiter. Such cases have been seen in the wild.

1 files changed, 1 insertions, 10 deletions

diff --git a/libqpdf/QPDFTokenizer.cc b/libqpdf/QPDFTokenizer.cc
index 2671fcbb..80fcf347 100644
--- a/libqpdf/QPDFTokenizer.cc
+++ b/libqpdf/QPDFTokenizer.cc
@@ -73,15 +73,6 @@ QPDFWordTokenFinder::check()
         // beginning of the input.
         return false;
     }
-    is->seek(token_start - 1, SEEK_SET);
-    char prev;
-    bool prev_okay = ((is->read(&prev, 1) == 1) && is_delimiter(prev));
-    is->seek(pos, SEEK_SET);
-    if (! prev_okay)
-    {
-        QTC::TC("qpdf", "QPDFTokenizer finder word not preceded by delimiter");
-        return false;
-    }
     return true;
 }
 
@@ -724,7 +715,7 @@ QPDFTokenizer::findEI(PointerHolder<InputSource> input)
         {
             break;
         }
-        this->m->inline_image_bytes = input->tell() - pos;
+        this->m->inline_image_bytes = input->tell() - pos - 2;
 
         QPDFTokenizer check;
         bool found_bad = false;