diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | libqpdf/QPDFTokenizer.cc | 35 | ||||
| -rw-r--r-- | qpdf/qpdf.testcov | 2 |
3 files changed, 27 insertions, 15 deletions
@@ -1,3 +1,8 @@ +2012-08-11 Jay Berkenbilt <ejb@ql.org> + + * Bug fix: let EOF terminate a literal token as well as + whitespace or comments. + 2012-07-31 Jay Berkenbilt <ejb@ql.org> * 3.0.0: release diff --git a/libqpdf/QPDFTokenizer.cc b/libqpdf/QPDFTokenizer.cc index 78ab1551..1a20bb5a 100644 --- a/libqpdf/QPDFTokenizer.cc +++ b/libqpdf/QPDFTokenizer.cc @@ -434,22 +434,19 @@ QPDFTokenizer::presentCharacter(char ch) void QPDFTokenizer::presentEOF() { - switch (state) + if (state == st_literal) { - case st_token_ready: - case st_top: - // okay - break; - - case st_in_comment: - state = st_top; - break; - - default: + QTC::TC("qpdf", "QPDF_Tokenizer EOF reading appendable token"); + resolveLiteral(); + } + else if (state != st_token_ready) + { + QTC::TC("qpdf", "QPDF_Tokenizer EOF reading token"); type = tt_bad; error_message = "EOF while reading token"; - state = st_token_ready; } + + state = st_token_ready; } bool @@ -480,14 +477,22 @@ QPDFTokenizer::readToken(PointerHolder<InputSource> input, Token token; bool unread_char; char char_to_unread; + bool presented_eof = false; while (! getToken(token, unread_char, char_to_unread)) { char ch; if (input->read(&ch, 1) == 0) { - throw QPDFExc(qpdf_e_damaged_pdf, input->getName(), - context, offset, - "EOF while reading token"); + if (! presented_eof) + { + presentEOF(); + presented_eof = true; + } + else + { + throw std::logic_error( + "getToken returned false after presenting EOF"); + } } else { diff --git a/qpdf/qpdf.testcov b/qpdf/qpdf.testcov index fd120839..0e062af4 100644 --- a/qpdf/qpdf.testcov +++ b/qpdf/qpdf.testcov @@ -238,3 +238,5 @@ QPDFWriter copy use_aes 1 QPDFObjectHandle indirect without context 0 QPDFObjectHandle trailing data in parse 0 qpdf pages encryption password 0 +QPDF_Tokenizer EOF reading token 0 +QPDF_Tokenizer EOF reading appendable token 0 |