From 13d9756a4579ffccf13d21e00e938cccdaa02211 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Thu, 25 Jan 2018 20:50:07 -0500
Subject: Minor fixes to tokenizer

---
 libqpdf/QPDFTokenizer.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'libqpdf/QPDFTokenizer.cc')

diff --git a/libqpdf/QPDFTokenizer.cc b/libqpdf/QPDFTokenizer.cc
index 6cababfe..6580a1be 100644
--- a/libqpdf/QPDFTokenizer.cc
+++ b/libqpdf/QPDFTokenizer.cc
@@ -404,7 +404,7 @@ QPDFTokenizer::presentCharacter(char ch)
 	else
 	{
 	    type = tt_bad;
-	    QTC::TC("qpdf", "QPDF_Tokenizer bad (");
+	    QTC::TC("qpdf", "QPDF_Tokenizer bad hexstring character");
 	    error_message = std::string("invalid character (") +
 		ch + ") in hexstring";
 	    state = st_token_ready;
@@ -439,7 +439,7 @@ QPDFTokenizer::presentEOF()
     {
         QTC::TC("qpdf", "QPDF_Tokenizer EOF reading token",
                 this->allow_eof ? 1 : 0);
-        if (this->allow_eof)
+        if ((this->allow_eof) && (state == st_top))
         {
             type = tt_eof;
         }
-- 
cgit v1.2.3-70-g09d2