Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(359)

Side by Side Diff: core/include/fpdfapi/fpdf_objects.h

Issue 341333004: Fix crash in _CMapLookupCallback (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: generation number checking Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #ifndef _FPDF_OBJECTS_ 7 #ifndef _FPDF_OBJECTS_
8 #define _FPDF_OBJECTS_ 8 #define _FPDF_OBJECTS_
9 #ifndef _FXCRT_EXTENSION_ 9 #ifndef _FXCRT_EXTENSION_
10 #include "../fxcrt/fx_ext.h" 10 #include "../fxcrt/fx_ext.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 int GetType() const 42 int GetType() const
43 { 43 {
44 return m_Type; 44 return m_Type;
45 } 45 }
46 46
47 FX_DWORD GetObjNum() const 47 FX_DWORD GetObjNum() const
48 { 48 {
49 return m_ObjNum; 49 return m_ObjNum;
50 } 50 }
51 51
52 FX_DWORD GetGenNum() const
53 {
54 return m_GenNum;
55 }
56
52 FX_BOOL IsIdentical(CPDF_Object* pObj) c onst; 57 FX_BOOL IsIdentical(CPDF_Object* pObj) c onst;
53 58
54 CPDF_Object* Clone(FX_BOOL bDirect = FALSE) const; 59 CPDF_Object* Clone(FX_BOOL bDirect = FALSE) const;
55 60
56 CPDF_Object* CloneRef(CPDF_IndirectObjects* pObjs) co nst; 61 CPDF_Object* CloneRef(CPDF_IndirectObjects* pObjs) co nst;
57 62
58 CPDF_Object* GetDirect() const; 63 CPDF_Object* GetDirect() const;
59 64
60 void Release(); 65 void Release();
61 66
(...skipping 21 matching lines...) Expand all
83 88
84 FX_BOOL IsModified() const 89 FX_BOOL IsModified() const
85 { 90 {
86 return FALSE; 91 return FALSE;
87 } 92 }
88 protected: 93 protected:
89 FX_DWORD m_Type; 94 FX_DWORD m_Type;
90 CPDF_Object() 95 CPDF_Object()
91 { 96 {
92 m_ObjNum = 0; 97 m_ObjNum = 0;
98 m_GenNum = 0;
93 } 99 }
94 100
95 FX_DWORD m_ObjNum; 101 FX_DWORD m_ObjNum;
102 FX_DWORD m_GenNum;
96 103
97 void Destroy(); 104 void Destroy();
98 105
99 106
100 ~CPDF_Object() {} 107 ~CPDF_Object() {}
101 friend class CPDF_IndirectObjects; 108 friend class CPDF_IndirectObjects;
102 friend class CPDF_Parser; 109 friend class CPDF_Parser;
103 friend class CPDF_SyntaxParser; 110 friend class CPDF_SyntaxParser;
104 private: 111 private:
105 CPDF_Object(const CPDF_Object& src) {} 112 CPDF_Object(const CPDF_Object& src) {}
(...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after
776 } 783 }
777 protected: 784 protected:
778 785
779 CFX_MapPtrToPtr m_IndirectObjs; 786 CFX_MapPtrToPtr m_IndirectObjs;
780 787
781 IPDF_DocParser* m_pParser; 788 IPDF_DocParser* m_pParser;
782 789
783 FX_DWORD m_LastObjNum; 790 FX_DWORD m_LastObjNum;
784 }; 791 };
785 #endif 792 #endif
OLDNEW
« no previous file with comments | « no previous file | core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698