From 7108cd7b98dc621bb64b3a09dbf38fdca4c71f55 Mon Sep 17 00:00:00 2001
From: m-holger <m-holger@kubitscheck.org>
Date: Wed, 24 Aug 2022 19:29:39 +0100
Subject: Remove redundant tests in QPDFTokenizer::readToken

---
 libqpdf/QPDFTokenizer.cc | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'libqpdf/QPDFTokenizer.cc')

diff --git a/libqpdf/QPDFTokenizer.cc b/libqpdf/QPDFTokenizer.cc
index 9f45a374..721ea7ea 100644
--- a/libqpdf/QPDFTokenizer.cc
+++ b/libqpdf/QPDFTokenizer.cc
@@ -989,15 +989,14 @@ QPDFTokenizer::readToken(
                 this->error_message = "unexpected EOF";
                 offset = input->getLastOffset();
             }
-            if (this->state != st_token_ready) {
-                throw std::logic_error(
-                    "getToken returned false after presenting EOF");
-            }
         } else {
-            presentCharacter(ch);
-            if (this->before_token && (input->getLastOffset() == offset)) {
+            handleCharacter(ch);
+            if (this->before_token) {
                 ++offset;
             }
+            if (this->in_token) {
+                this->raw_val += ch;
+            }
             if (max_len && (this->raw_val.length() >= max_len) &&
                 (this->state != st_token_ready)) {
                 // terminate this token now
-- 
cgit v1.2.3-54-g00ecf