Fix parsing of object numbers > 16,777,216.

core/include/fpdfapi/fpdf_parser.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_
 #define CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_
 
 #include <map>
@@ skipping 221 matching lines @@
 };
 
 class CPDF_SyntaxParser {
  public:
   CPDF_SyntaxParser();
   virtual ~CPDF_SyntaxParser();
 
   void InitParser(IFX_FileRead* pFileAccess, FX_DWORD HeaderOffset);
 
   FX_FILESIZE SavePos() const { return m_Pos; }
-
   void RestorePos(FX_FILESIZE pos) { m_Pos = pos; }
 
   CPDF_Object* GetObject(CPDF_IndirectObjectHolder* pObjList,
                          FX_DWORD objnum,
                          FX_DWORD gennum,
                          FX_BOOL bDecrypt);
-
   CPDF_Object* GetObjectByStrict(CPDF_IndirectObjectHolder* pObjList,
                                  FX_DWORD objnum,
                                  FX_DWORD gennum);
-
-  int GetDirectNum();
-
   CFX_ByteString GetKeyword();
 
   void ToNextLine();
-
   void ToNextWord();
 
   FX_BOOL SearchWord(const CFX_ByteStringC& word,
                      FX_BOOL bWholeWord,
                      FX_BOOL bForward,
                      FX_FILESIZE limit);
-
   int SearchMultiWord(const CFX_ByteStringC& words,
                       FX_BOOL bWholeWord,
                       FX_FILESIZE limit);
-
   FX_FILESIZE FindTag(const CFX_ByteStringC& tag, FX_FILESIZE limit);
 
   void SetEncrypt(std::unique_ptr<CPDF_CryptoHandler> pCryptoHandler);
 
+  FX_BOOL ReadBlock(uint8_t* pBuf, FX_DWORD size);
   FX_BOOL GetCharAt(FX_FILESIZE pos, uint8_t& ch);
-
-  FX_BOOL ReadBlock(uint8_t* pBuf, FX_DWORD size);
-
   CFX_ByteString GetNextWord(bool* bIsNumber);
 
  protected:
   friend class CPDF_Parser;
   friend class CPDF_DataAvail;
   friend class fpdf_parser_parser_ReadHexString_Test;
 
   static const int kParserMaxRecursionDepth = 64;
   static int s_CurrentRecursionDepth;
 
@@ skipping 22 matching lines @@
   int m_MetadataObjnum;
   IFX_FileRead* m_pFileAccess;
   FX_DWORD m_HeaderOffset;
   FX_FILESIZE m_FileLen;
   uint8_t* m_pFileBuf;
   FX_DWORD m_BufSize;
   FX_FILESIZE m_BufOffset;
   std::unique_ptr<CPDF_CryptoHandler> m_pCryptoHandler;
   uint8_t m_WordBuffer[257];
   FX_DWORD m_WordSize;
+
+ private:
+  uint32_t GetDirectNum();
 };
 
 class CPDF_Parser {
  public:
   enum Error {
     SUCCESS = 0,
     FILE_ERROR,
     FORMAT_ERROR,
     PASSWORD_ERROR,
     HANDLER_ERROR
@@ skipping 533 matching lines @@
                        FX_DWORD src_size,
                        const CPDF_Dictionary* pDict,
                        uint8_t*& dest_buf,
                        FX_DWORD& dest_size,
                        CFX_ByteString& ImageEncoding,
                        CPDF_Dictionary*& pImageParms,
                        FX_DWORD estimated_size,
                        FX_BOOL bImageAcc);
 
 #endif  // CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_