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, 5 deletions

diff --git a/core/fpdfapi/parser/cpdf_object_stream.cpp b/core/fpdfapi/parser/cpdf_object_stream.cpp
index 530b774a63..a85cbf1ffa 100644
--- a/core/fpdfapi/parser/cpdf_object_stream.cpp
+++ b/core/fpdfapi/parser/cpdf_object_stream.cpp
@@ -101,9 +101,7 @@ void CPDF_ObjectStream::Init(const CPDF_Stream* stream) {
         true);
   }
 
-  CPDF_SyntaxParser syntax;
-  syntax.InitParser(data_stream_, 0);
-
+  CPDF_SyntaxParser syntax(data_stream_);
   const int object_count = stream->GetDict()->GetIntegerFor("N");
   for (int32_t i = object_count; i > 0; --i) {
     if (syntax.GetPos() >= data_stream_->GetSize())
@@ -130,8 +128,7 @@ std::unique_ptr<CPDF_Object> CPDF_ObjectStream::ParseObjectAtOffset(
   if (offset_in_stream.ValueOrDie() >= data_stream_->GetSize())
     return nullptr;
 
-  CPDF_SyntaxParser syntax;
-  syntax.InitParser(data_stream_, 0);
+  CPDF_SyntaxParser syntax(data_stream_);
   syntax.SetPos(offset_in_stream.ValueOrDie());
   return syntax.GetObjectBody(pObjList);
 }