Move CPDF_SyntaxParser init methods into ctor.

- CPDF_SyntaxParser can no longer be initialized multiple times.
- Make the file length and header offset const.
- Make the header offset type FX_FILESIZE consistently.
- Simplify for the common case where the header offset is 0.

Change-Id: I7138db1fbcec3b7578b0239b92fc1154fa4dc4ce
Reviewed-on: https://pdfium-review.googlesource.com/38850
Reviewed-by: Art Snake <art-snake@yandex-team.ru>
Commit-Queue: Lei Zhang <thestig@chromium.org>

1 files changed, 2 insertions, 6 deletions

diff --git a/core/fpdfapi/parser/cpdf_parser.cpp b/core/fpdfapi/parser/cpdf_parser.cpp
index be18560ffc..ba8974a0de 100644
--- a/core/fpdfapi/parser/cpdf_parser.cpp
+++ b/core/fpdfapi/parser/cpdf_parser.cpp
@@ -57,11 +57,7 @@ class ObjectsHolderStub : public CPDF_Parser::ParsedObjectsHolder {
 }  // namespace
 
 CPDF_Parser::CPDF_Parser(ParsedObjectsHolder* holder)
-    : m_pSyntax(pdfium::MakeUnique<CPDF_SyntaxParser>()),
-      m_pObjectsHolder(holder),
-      m_bHasParsed(false),
-      m_bXRefStream(false),
-      m_FileVersion(0),
+    : m_pObjectsHolder(holder),
       m_CrossRefTable(pdfium::MakeUnique<CPDF_CrossRefTable>()) {
   if (!holder) {
     m_pOwnedObjectsHolder = pdfium::MakeUnique<ObjectsHolderStub>();
@@ -131,7 +127,7 @@ bool CPDF_Parser::InitSyntaxParser(
   if (validator->GetSize() < header_offset + kPDFHeaderSize)
     return false;
 
-  m_pSyntax->InitParserWithValidator(validator, header_offset);
+  m_pSyntax = pdfium::MakeUnique<CPDF_SyntaxParser>(validator, header_offset);
   return ParseFileVersion();
 }