OpenSystemsDevelopment / qpdf

Commit 13d9756a4579ffccf13d21e00e938cccdaa02211

Authored by Jay Berkenbilt
1 parent aa2cfad6

Minor fixes to tokenizer

Inline Side-by-side
Showing 2 changed files with 3 additions and 3 deletions
libqpdf/QPDFTokenizer.cc
  View file @13d9756
@@ -404,7 +404,7 @@ QPDFTokenizer::presentCharacter(char ch) @@ -404,7 +404,7 @@ QPDFTokenizer::presentCharacter(char ch)
404 else 404 else
405 { 405 {
406 type = tt_bad; 406 type = tt_bad;
407 - QTC::TC("qpdf", "QPDF_Tokenizer bad ("); 407 + QTC::TC("qpdf", "QPDF_Tokenizer bad hexstring character");
408 error_message = std::string("invalid character (") + 408 error_message = std::string("invalid character (") +
409 ch + ") in hexstring"; 409 ch + ") in hexstring";
410 state = st_token_ready; 410 state = st_token_ready;
@@ -439,7 +439,7 @@ QPDFTokenizer::presentEOF() @@ -439,7 +439,7 @@ QPDFTokenizer::presentEOF()
439 { 439 {
440 QTC::TC("qpdf", "QPDF_Tokenizer EOF reading token", 440 QTC::TC("qpdf", "QPDF_Tokenizer EOF reading token",
441 this->allow_eof ? 1 : 0); 441 this->allow_eof ? 1 : 0);
442 - if (this->allow_eof) 442 + if ((this->allow_eof) && (state == st_top))
443 { 443 {
444 type = tt_eof; 444 type = tt_eof;
445 } 445 }
qpdf/qpdf.testcov
  View file @13d9756
@@ -66,7 +66,7 @@ QPDFObjectHandle bad dictionary close 0 @@ -66,7 +66,7 @@ QPDFObjectHandle bad dictionary close 0
66 QPDF can't find xref 0 66 QPDF can't find xref 0
67 QPDF_Tokenizer bad ) 0 67 QPDF_Tokenizer bad ) 0
68 QPDF_Tokenizer bad > 0 68 QPDF_Tokenizer bad > 0
69 -QPDF_Tokenizer bad ( 0 69 +QPDF_Tokenizer bad hexstring character 0
70 QPDF_Tokenizer null in name 0 70 QPDF_Tokenizer null in name 0
71 QPDF_Tokenizer bad name 0 71 QPDF_Tokenizer bad name 0
72 QPDF_Stream invalid filter 0 72 QPDF_Stream invalid filter 0