Tweak utf8 checks

1 files changed, 4 insertions, 8 deletions

diff --git a/libqpdf/QUtil.cc b/libqpdf/QUtil.cc
index 25c7281f..7b4b119b 100644
--- a/libqpdf/QUtil.cc
+++ b/libqpdf/QUtil.cc
@@ -1825,16 +1825,12 @@ QUtil::analyze_encoding(
     bool any_errors = false;
     while (pos < len) {
         bool error = false;
-        auto old_pos = pos;
-        unsigned long codepoint = get_next_utf8_codepoint(val, pos, error);
+        auto o_pos = pos;
+        get_next_utf8_codepoint(val, pos, error);
         if (error) {
             any_errors = true;
-            for (auto p = old_pos; p < pos; p++) {
-                if (static_cast<unsigned char>(val.at(p)) >= 128) {
-                    has_8bit_chars = true;
-                }
-            }
-        } else if (codepoint >= 128) {
+        }
+        if (pos - o_pos > 1 || val[o_pos] & 0x80) {
             has_8bit_chars = true;
         }
     }