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/QPDFObjectHandle.cc b/libqpdf/QPDFObjectHandle.cc
index de5d56b3..a3a4d61d 100644
--- a/libqpdf/QPDFObjectHandle.cc
+++ b/libqpdf/QPDFObjectHandle.cc
@@ -1570,16 +1570,7 @@ QPDFObjectHandle::parseContentStream_data(
             }
             else
             {
-                // Skip back over EI
-                input->seek(-2, SEEK_CUR);
-                std::string inline_image = t.getRawValue();
-                for (int i = 0; i < 3; ++i)
-                {
-                    if (inline_image.length() > 0)
-                    {
-                        inline_image.erase(inline_image.length() - 1);
-                    }
-                }
+                std::string inline_image = t.getValue();
                 QTC::TC("qpdf", "QPDFObjectHandle inline image token");
                 callbacks->handleObject(
                     QPDFObjectHandle::newInlineImage(inline_image));