diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2018-01-26 02:50:07 +0100 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2018-01-29 00:34:43 +0100 |
| commit | 13d9756a4579ffccf13d21e00e938cccdaa02211 (patch) | |
| tree | f06a49b15e360449bdf6d40331a4b26c89e54302 | |
| parent | aa2cfad61a1c51e15571c77a8cf70aa872140aca (diff) | |
| download | qpdf-13d9756a4579ffccf13d21e00e938cccdaa02211.tar.zst | |
Minor fixes to tokenizer
| -rw-r--r-- | libqpdf/QPDFTokenizer.cc | 4 | ||||
| -rw-r--r-- | qpdf/qpdf.testcov | 2 |
2 files changed, 3 insertions, 3 deletions
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; } diff --git a/qpdf/qpdf.testcov b/qpdf/qpdf.testcov index fd717783..b1b1d21b 100644 --- a/qpdf/qpdf.testcov +++ b/qpdf/qpdf.testcov @@ -66,7 +66,7 @@ QPDFObjectHandle bad dictionary close 0 QPDF can't find xref 0 QPDF_Tokenizer bad ) 0 QPDF_Tokenizer bad > 0 -QPDF_Tokenizer bad ( 0 +QPDF_Tokenizer bad hexstring character 0 QPDF_Tokenizer null in name 0 QPDF_Tokenizer bad name 0 QPDF_Stream invalid filter 0 |