octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2024-12-23 03:18:59 +00:00
Code Issues Releases Wiki Activity

Minor fixes to tokenizer

Browse Source
This commit is contained in:
Jay Berkenbilt 2018-01-25 20:50:07 -05:00
parent aa2cfad61a
commit 13d9756a45
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libqpdf/QPDFTokenizer.cc
View File

@ -404,7 +404,7 @@ QPDFTokenizer::presentCharacter(char ch)
else else
{ {
type = tt_bad; type = tt_bad;
QTC::TC("qpdf", "QPDF_Tokenizer bad ("); QTC::TC("qpdf", "QPDF_Tokenizer bad hexstring character");
error_message = std::string("invalid character (") + error_message = std::string("invalid character (") +
ch + ") in hexstring"; ch + ") in hexstring";
state = st_token_ready; state = st_token_ready;
@ -439,7 +439,7 @@ QPDFTokenizer::presentEOF()
{ {
QTC::TC("qpdf", "QPDF_Tokenizer EOF reading token", QTC::TC("qpdf", "QPDF_Tokenizer EOF reading token",
this->allow_eof ? 1 : 0); this->allow_eof ? 1 : 0);
if (this->allow_eof) if ((this->allow_eof) && (state == st_top))
{ {
type = tt_eof; type = tt_eof;
} }

2
qpdf/qpdf.testcov
View File

@ -66,7 +66,7 @@ QPDFObjectHandle bad dictionary close 0
QPDF can't find xref 0 QPDF can't find xref 0
QPDF_Tokenizer bad ) 0 QPDF_Tokenizer bad ) 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 null in name 0
QPDF_Tokenizer bad name 0 QPDF_Tokenizer bad name 0
QPDF_Stream invalid filter 0 QPDF_Stream invalid filter 0