summaryrefslogtreecommitdiff
path: root/core/include/fpdfapi/fpdf_objects.h
diff options
context:
space:
mode:
authorJUN FANG <jun_fang@foxitsoftware.com>2015-04-23 10:12:19 -0700
committerJUN FANG <jun_fang@foxitsoftware.com>2015-04-23 10:12:19 -0700
commit4eeef1d776ce7368063f9a7698cfa736821d4186 (patch)
tree51d16f9714aadc1e9ac97748e00aa18cd9521aa9 /core/include/fpdfapi/fpdf_objects.h
parentfbfcbc5e82d89585a63a77c63e782fb6768c8dc8 (diff)
downloadpdfium-4eeef1d776ce7368063f9a7698cfa736821d4186.tar.xz
Fix segmentation fault 'denial of service condition'
BUG=467392 R=thestig@chromium.org, tsepez@chromium.org Review URL: https://codereview.chromium.org/1064713008
Diffstat (limited to 'core/include/fpdfapi/fpdf_objects.h')
-rw-r--r--core/include/fpdfapi/fpdf_objects.h50
1 files changed, 25 insertions, 25 deletions
diff --git a/core/include/fpdfapi/fpdf_objects.h b/core/include/fpdfapi/fpdf_objects.h
index 0315465367..b3980a4f0f 100644
--- a/core/include/fpdfapi/fpdf_objects.h
+++ b/core/include/fpdfapi/fpdf_objects.h
@@ -39,12 +39,12 @@ class CPDF_Object
{
public:
- int GetType() const
+ int GetType() const
{
return m_Type;
}
- FX_DWORD GetObjNum() const
+ FX_DWORD GetObjNum() const
{
return m_ObjNum;
}
@@ -54,51 +54,51 @@ public:
return m_GenNum;
}
- FX_BOOL IsIdentical(CPDF_Object* pObj) const;
+ FX_BOOL IsIdentical(CPDF_Object* pObj) const;
- CPDF_Object* Clone(FX_BOOL bDirect = FALSE) const;
+ CPDF_Object* Clone(FX_BOOL bDirect = FALSE) const;
- CPDF_Object* CloneRef(CPDF_IndirectObjects* pObjs) const;
+ CPDF_Object* CloneRef(CPDF_IndirectObjects* pObjs) const;
- CPDF_Object* GetDirect() const;
+ CPDF_Object* GetDirect() const;
- void Release();
+ void Release();
- CFX_ByteString GetString() const;
-
- CFX_ByteStringC GetConstString() const;
+ CFX_ByteString GetString() const;
- CFX_WideString GetUnicodeText(CFX_CharMap* pCharMap = NULL) const;
+ CFX_ByteStringC GetConstString() const;
- FX_FLOAT GetNumber() const;
+ CFX_WideString GetUnicodeText(CFX_CharMap* pCharMap = NULL) const;
+ FX_FLOAT GetNumber() const;
- FX_FLOAT GetNumber16() const;
+ FX_FLOAT GetNumber16() const;
- int GetInteger() const;
+ int GetInteger() const;
- CPDF_Dictionary* GetDict() const;
+ CPDF_Dictionary* GetDict() const;
- CPDF_Array* GetArray() const;
+ CPDF_Array* GetArray() const;
- void SetString(const CFX_ByteString& str);
+ void SetString(const CFX_ByteString& str);
- void SetUnicodeText(FX_LPCWSTR pUnicodes, int len = -1);
+ void SetUnicodeText(FX_LPCWSTR pUnicodes, int len = -1);
- int GetDirectType() const;
+ int GetDirectType() const;
- FX_BOOL IsModified() const
+ FX_BOOL IsModified() const
{
return FALSE;
}
protected:
CPDF_Object(FX_DWORD type) : m_Type(type), m_ObjNum(0), m_GenNum(0) { }
~CPDF_Object() { }
+ void Destroy();
- void Destroy();
-
- FX_DWORD m_Type;
- FX_DWORD m_ObjNum;
- FX_DWORD m_GenNum;
+ static const int OBJECT_REF_MAX_DEPTH = 128;
+ static int s_nCurRefDepth;
+ FX_DWORD m_Type;
+ FX_DWORD m_ObjNum;
+ FX_DWORD m_GenNum;
friend class CPDF_IndirectObjects;
friend class CPDF_Parser;