Bug fix: content normalizer should not add trailing newline

Adding a trailing newline in content normalization damages files whose contents are split across streams in the middle of tokens. Let QPDFWriter add the newline with the indicator to ignore the newline, which it already does. This changes the way some qdf files look.

Bug fix: content normalizer should not add trailing newline
Adding a trailing newline in content normalization damages files whose contents are split across streams in the middle of tokens. Let QPDFWriter add the newline with the indicator to ignore the newline, which it already does. This changes the way some qdf files look.
Jay Berkenbilt
1 parent cc108a7f
Showing 7 changed files with 65 additions and 54 deletions
ChangeLog
examples/qtest/mod-info/files/2.qdf
libqpdf/Pl_QPDFTokenizer.cc
qpdf/qtest/qpdf/good14.out
qpdf/qtest/qpdf/newline-before-endstream-nl-qdf.pdf
qpdf/qtest/qpdf/newline-before-endstream-qdf.pdf
qpdf/qtest/qpdf/stream-line-enders.qdf
@@ -62,6 +62,22 @@
 	QPDFObjectHandle::parsePageContents() method in favor of the older
 	QPDFObjectHandle::parseContentStream() method.
  
+	* Bug fix: change where the trailing newline is added to a stream
+	in QDF mode when content normalization is enabled (the default for
+	QDF mode). Before, the content normalizer ensured that the output
+	ended with a trailing newline, but this had the undesired side
+	effect of including the newline in the stream data for purposes of
+	length computation. QPDFWriter already appends a newline without
+	counting in length for better readability. Ordinarily this makes
+	no difference, but in the rare case of a page's contents being
+	split in the middle of a token, the old behavior could cause the
+	extra newline to be interprted as part of the token. This bug
+	could only be triggered in qdf mode, which is a mode intended for
+	manual inspection of PDF files' contents, so it is very unlikely
+	to have caused any actual problems for people using qpdf for
+	production use. Even if it did, it would be very unusual for a PDF
+	file to actually be adversely affected by this issue.
+
 2018-02-04  Jay Berkenbilt  <ejb@ql.org>
  
 	* Add QPDFWriter::setLinearizationPass1Filename method and
@@ -149,10 +149,6 @@ Pl_QPDFTokenizer::finish()
             writeNext(&this->char_to_unread, 1);
         }
     }
-    if (! this->just_wrote_nl)
-    {
-	writeNext("\n", 1);
-    }
  
     getNext()->finish();
 }
@@ -13,8 +13,7 @@ three lines
 <8a8b>
 (ab)
 <8c><dd> ) >
-<610062> (MOO)
--- stream 1 --
+<610062> (MOO)-- stream 1 --
 This stream does end with a newline.
 // tests:
 //   bad tokens preserved
@@ -35,16 +34,14 @@ This stream does end with a newline.
 -- stream 2 --
 (This stream ends with a \001 bad token
 -- stream 3 --
-<AB X
--- stream 4 --
+<AB X-- stream 4 --
 (ends with a name)
-/ThisMustBeLast
--- stream 5 --
+/ThisMustBeLast-- stream 5 --
 % This stream has an inline image marker that is not terminated
 (Potato)
  
 BI
 ID
-<506f7
+<506f7
 461746f>
 test 3 done
@@ -144,13 +144,12 @@ BT
   72 720 Td
   (Potato) Tj
 ET
-
 endstream
 endobj
  
 %QDF: ignore_newline
 11 0 obj
-128
+127
 endobj
  
 %% Original object ID: 10 0
@@ -186,13 +185,12 @@ BT
   72 720 Td
   (Potato) Tj
 ET
-
 endstream
 endobj
  
 %QDF: ignore_newline
 15 0 obj
-132
+131
 endobj
  
 %% Original object ID: 13 0
@@ -227,18 +225,18 @@ xref
 0000001185 00000 n 
 0000001330 00000 n 
 0000001415 00000 n 
-0000001622 00000 n 
-0000001671 00000 n 
-0000001818 00000 n 
-0000001905 00000 n 
-0000002116 00000 n 
-0000002165 00000 n 
-0000002312 00000 n 
+0000001621 00000 n 
+0000001670 00000 n 
+0000001817 00000 n 
+0000001904 00000 n 
+0000002114 00000 n 
+0000002163 00000 n 
+0000002310 00000 n 
 trailer <<
   /Root 1 0 R
   /Size 18
   /ID [<ff82013f9cede898ae8db2f2f177aa1d><31415926535897932384626433832795>]
 >>
 startxref
-2348
+2346
 %%EOF
@@ -145,8 +145,9 @@ ET
 endstream
 endobj
  
+%QDF: ignore_newline
 11 0 obj
-128
+127
 endobj
  
 %% Original object ID: 10 0
@@ -185,8 +186,9 @@ ET
 endstream
 endobj
  
+%QDF: ignore_newline
 15 0 obj
-132
+131
 endobj
  
 %% Original object ID: 13 0
@@ -221,18 +223,18 @@ xref
 0000001163 00000 n 
 0000001308 00000 n 
 0000001393 00000 n 
-0000001578 00000 n 
-0000001627 00000 n 
-0000001774 00000 n 
-0000001861 00000 n 
-0000002050 00000 n 
-0000002099 00000 n 
-0000002246 00000 n 
+0000001599 00000 n 
+0000001648 00000 n 
+0000001795 00000 n 
+0000001882 00000 n 
+0000002092 00000 n 
+0000002141 00000 n 
+0000002288 00000 n 
 trailer <<
   /Root 1 0 R
   /Size 18
   /ID [<ff82013f9cede898ae8db2f2f177aa1d><31415926535897932384626433832795>]
 >>
 startxref
-2282
+2324
 %%EOF
@@ -106,8 +106,9 @@ ET
 endstream
 endobj
  
+%QDF: ignore_newline
 11 0 obj
-12
+11
 endobj
  
 %% Original object ID: 8 0
@@ -142,14 +143,14 @@ xref
 0000000799 00000 n 
 0000000866 00000 n 
 0000000935 00000 n 
-0000001004 00000 n 
-0000001051 00000 n 
-0000001197 00000 n 
+0000001025 00000 n 
+0000001072 00000 n 
+0000001218 00000 n 
 trailer <<
   /Root 1 0 R
   /Size 14
   /ID [<08aa98c73f8a7262d77c8328772c3989><31415926535897932384626433832795>]
 >>
 startxref
-1233
+1254
 %%EOF