From 3c4110184c02068e98849c7cbe11807ad7343721 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Sat, 11 Aug 2012 12:36:57 -0400
Subject: [PATCH] Add specially crafted test cases for EOF error

This replaces a PDF from the wild that I didn't want to include in the
test suite but used to verify the original fix.
---
 TODO                                       |   5 -----
 qpdf/qtest/qpdf.test                       |  10 +++++++++-
 qpdf/qtest/qpdf/eof-reading-token.out      |   5 +++++
 qpdf/qtest/qpdf/eof-reading-token.pdf      | Bin 0 -> 1632 bytes
 qpdf/qtest/qpdf/eof-terminates-literal.out |   6 ++++++
 qpdf/qtest/qpdf/eof-terminates-literal.pdf | Bin 0 -> 1632 bytes
 6 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 qpdf/qtest/qpdf/eof-reading-token.out
 create mode 100644 qpdf/qtest/qpdf/eof-reading-token.pdf
 create mode 100644 qpdf/qtest/qpdf/eof-terminates-literal.out
 create mode 100644 qpdf/qtest/qpdf/eof-terminates-literal.pdf

diff --git a/TODO b/TODO
index 39a74de6..53f00a0e 100644
--- a/TODO
+++ b/TODO
@@ -5,11 +5,6 @@ Next
    mention in latest release notes including that it was inadvertently
    left out of the release notes for 3.0.0.
 
- * EOF while reading token causes a tokenizer error even when a valid
-   token is ready.  This can happen in an object stream if there is no
-   newline or whitespace character at the end and the last token in
-   the object stream is not an array or dictionary.
-
 
 General
 =======
diff --git a/qpdf/qtest/qpdf.test b/qpdf/qtest/qpdf.test
index da318491..fda92b30 100644
--- a/qpdf/qtest/qpdf.test
+++ b/qpdf/qtest/qpdf.test
@@ -149,7 +149,7 @@ $td->runtest("remove page we don't have",
 	     $td->NORMALIZE_NEWLINES);
 # ----------
 $td->notify("--- Miscellaneous Tests ---");
-$n_tests += 45;
+$n_tests += 47;
 
 $td->runtest("qpdf version",
 	     {$td->COMMAND => "qpdf --version"},
@@ -374,6 +374,14 @@ $td->runtest("parse objects from string",
              {$td->COMMAND => "test_driver 31 minimal.pdf"}, # file not used
              {$td->FILE => "parse-object.out", $td->EXIT_STATUS => 0},
              $td->NORMALIZE_NEWLINES);
+$td->runtest("EOF terminating literal tokens",
+             {$td->COMMAND => "qpdf --check eof-terminates-literal.pdf"},
+             {$td->FILE => "eof-terminates-literal.out", $td->EXIT_STATUS => 0},
+             $td->NORMALIZE_NEWLINES);
+$td->runtest("EOF reading token",
+             {$td->COMMAND => "qpdf --check eof-reading-token.pdf"},
+             {$td->FILE => "eof-reading-token.out", $td->EXIT_STATUS => 0},
+             $td->NORMALIZE_NEWLINES);
 
 show_ntests();
 # ----------
diff --git a/qpdf/qtest/qpdf/eof-reading-token.out b/qpdf/qtest/qpdf/eof-reading-token.out
new file mode 100644
index 00000000..58e5b09d
--- /dev/null
+++ b/qpdf/qtest/qpdf/eof-reading-token.out
@@ -0,0 +1,5 @@
+checking eof-reading-token.pdf
+PDF Version: 1.3
+File is not encrypted
+File is not linearized
+object stream 12 (file position 5): EOF while reading token
diff --git a/qpdf/qtest/qpdf/eof-reading-token.pdf b/qpdf/qtest/qpdf/eof-reading-token.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..080bb50b96ae972897472b2b34c39037ff0b5ff1
GIT binary patch
literal 1632
zcmbVMOK;Oa5Vq6u(2Bx|`v}R<N~M0pv1?RSqD=!8eT2kNq^Jis*#uXqUD+EHxbqi~
zkT_LB;=m1Y<_Z@M9N^jm`~f7y4KcHENK+DuYGpItS?_$`%zissxmdbx&gGf*?&rZT
zrp@&p#xxB!ldu&=K^x+oU0xTkTD$=!7z_uw*unw>(91!Kr(mJ4LR0_oJ_mg{5J5X`
zvBgEkqXvCEE+B4Xw0RJ4IqpOPObT`<Y@|@bH-LNwusr~g$j2bahkM7c#~_RX9R-U7
zk3<S~KY?}L2!o}#o8cM~z4z~!mYlgBS;?dvB)EN$eubxTC#hpaWOXoyQjF`_gr+7q
z8597PhjP=)NnEdT0dBS;{aGm~qhm=fV@OH587Hv+&x|oGMyU-lUgJ?qJcNRTLZDP6
zJlJDPK2jlemJNOr-(3rT2KWtppDxED5b+H7yKKd$Bh7a850|15gl(U6-k3b20t^T(
z1u2(B(r@$jBQC;vKvY(udfW)37U)}HbTdlBzJnGwf<07ONs6S}*%4B7Bt7ZrX^>(b
zE8HkWBXve~Cqg7O9d85~pLYe@{*%u95a%Ak=FV<a?9s<rQB7Bp>xs7%CaD0MA<wWa
zc%qluf#5}sX~_f4O4xnz#y1WvJ8!(5RL(t9pZ{H5)A%27i$tn#90f0s=LGb;P4J)d
zwrL}QscX3_BM1!N&@tItviPSUaNjumH2q#*o&E4-Lb-e}@p=S<VG)mEV0x!4!98Sf
zX?A_><5^|uNABAQ{9(=Z@E=q--IV_6JM%Qzf*N*73x{kFl{m&`hUX`{V>Nt&?MbR+
zwFtEZ!zeVHO~Y{;uEV{8XW9+VE?AyZa16_<yNf4(AyMx79JN;S2nS3F2c~S9V9J}m
zO*bJ^oPv+4*f^fz_^znxS4GX;!qHLGiL*Fnl$>%N?Mt*wQ75mWy@2)=+KY;MW?C81
V15yzrqMKkz%sgsQ(^fW1>^Baot?2*&

literal 0
HcmV?d00001

diff --git a/qpdf/qtest/qpdf/eof-terminates-literal.out b/qpdf/qtest/qpdf/eof-terminates-literal.out
new file mode 100644
index 00000000..2feaefdd
--- /dev/null
+++ b/qpdf/qtest/qpdf/eof-terminates-literal.out
@@ -0,0 +1,6 @@
+checking eof-terminates-literal.pdf
+PDF Version: 1.3
+File is not encrypted
+File is not linearized
+No syntax or stream encoding errors found; the file may still contain
+errors that qpdf cannot detect
diff --git a/qpdf/qtest/qpdf/eof-terminates-literal.pdf b/qpdf/qtest/qpdf/eof-terminates-literal.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..e695ec58852d91ba910e13ed76ef65d630224950
GIT binary patch
literal 1632
zcmbVMOK;Oa5Vq6u(2Bx|`v}R<N~M0pv1?RSqD=!8eT2kNq^Jis*#uXqUD+EHxbqi~
zkl=!Z;Ep(Rg$oA`aP0y9021PcnAtd_DG5cjvKjBJcfN0Cza6byEL}C{@=Sa8^TjWw
z&GjC}Gz~VBuoXr@8{(Z^UKg-hyapy13<tT`!U6-(%R!5$V4<%<Q~%*U2YopZK|5}-
z#YM)W27Np(AZ}!|c@S_p?nDAi3U(`Oq)@{*fP4n9Jphr&M<B?Dd&jWHAdCVX28#rb
zL<)94fpy*pgQd8e;TjUX_wSgNoVgxZ$)p@4xP6d*g{N^RsbfWCbufogjO*EirY1NU
z6abcoa?{I6T(5EgZnh%*St%)_BS|h}NJ+XGC$Rs|j4>@nsSPq-<55f8hk}Gcpj0G0
z*kemRQXzJh4So~fT?>B(_zirYF2^De@eKI8Y{jP|&35$<m!c7bZ69~um^`Bb3<xa+
zDVIgkZ}Rp7F2Z_1R92#T+z6u<=v!fQJxasAgBCY}Jycmqilo}v5mIy{J?ZIbkYXMw
z+$cpObw+h3LL@aEZv+{icLm%2lg|7Q=N`i5&Tdug(Z^X)O;?iZiMJFcsQ{ZH&#*0c
zqL<o%;6;vU$pg(w*nRfKHx4X2Z@isU&OA|{{#{+u_#beKM5=Eb1}~8381%eN@SpRx
zX(NHDE4fP}2n^rQG1*(P_$MH6*Eskz{a#<4{qSW{x%hnI)d&W|A|AuQ^iEiUJILU|
z?E2cr)5_G3+_w?<!<y~k->Y!CDgD!T=4rA8HSCfW4%r|oag5Cj&rf#8YWN7-lT^uS
z5o!yDQD`=shT}F|hkFIjv>TpXuso;W7?xLe7mxo!qTKd5YOUrG4ww=SOxZHQlsA2w
zZbGIw1s_$haXiNHT~XDqikiEDqob%3r*X_EIpr+cmuQ)yPF_ZP4()5S=N0wTv@)Ux
Uq#{T}H^GvadDNn&t!$RqZ~k+w-~a#s

literal 0
HcmV?d00001