Don't interpret word tokens in content streams (fixes #82)

Jay Berkenbilt
1 parent 701b518d
Showing 2 changed files with 8 additions and 5 deletions
ChangeLog
libqpdf/QPDFObjectHandle.cc
 2017-07-26  Jay Berkenbilt  <ejb@ql.org>
  
+	* Don't attempt to interpret syntactic keywords (like R and
+	endobj) found while parsing content streams.
+
 	* Detect infinite loops while resolving objects. This could happen
 	if something inside an object that had to be resolved during
 	parsing, such as a stream length, recursively referenced the
@@ -964,7 +964,11 @@ QPDFObjectHandle::parseInternal(PointerHolder&lt;InputSource&gt; input,
 	  case QPDFTokenizer::tt_word:
 	    {
 		std::string const& value = token.getValue();
-		if ((value == "R") && (in_array || in_dictionary) &&
+                if (content_stream)
+                {
+                    object = QPDFObjectHandle::newOperator(value);
+                }
+		else if ((value == "R") && (in_array || in_dictionary) &&
 		    (olist.size() >= 2) &&
                     (! olist.at(olist.size() - 1).isIndirect()) &&
 		    (olist.at(olist.size() - 1).isInteger()) &&
@@ -996,10 +1000,6 @@ QPDFObjectHandle::parseInternal(PointerHolder&lt;InputSource&gt; input,
 		    input->seek(input->getLastOffset(), SEEK_SET);
                     empty = true;
 		}
-		else if (content_stream)
-                {
-                    object = QPDFObjectHandle::newOperator(token.getValue());
-                }
 		else
 		{
 		    throw QPDFExc(qpdf_e_damaged_pdf, input->getName(),