core/src/fpdfapi/fpdf_page/pageint.h - Issue 477323002: Font is used after release in CPDF_TextStateData::~CPDF_TextStateData

Unified Diff: core/src/fpdfapi/fpdf_page/pageint.h

Issue 477323002: Font is used after release in CPDF_TextStateData::~CPDF_TextStateData (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: Created 6 years, 4 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 side-by-side diff with in-line comments

Download patch

Index: core/src/fpdfapi/fpdf_page/pageint.h

diff --git a/core/src/fpdfapi/fpdf_page/pageint.h b/core/src/fpdfapi/fpdf_page/pageint.h

index 4e097ca49eeed677d5e7160217051f4ef117d971..15c7f6cd2623a01a90dcbd239466bd945a0a2d99 100644

--- a/core/src/fpdfapi/fpdf_page/pageint.h

+++ b/core/src/fpdfapi/fpdf_page/pageint.h

@@ -412,29 +412,32 @@ class CPDF_DocPageData : public CFX_Object

public:

CPDF_DocPageData(CPDF_Document *pPDFDoc);

~CPDF_DocPageData();

- void Clear(FX_BOOL bRelease = FALSE);

- CPDF_Font* GetFont(CPDF_Dictionary* pFontDict, FX_BOOL findOnly);

- CPDF_Font* GetStandardFont(FX_BSTR fontName, CPDF_FontEncoding* pEncoding);

- void ReleaseFont(CPDF_Dictionary* pFontDict);

- CPDF_ColorSpace* GetColorSpace(CPDF_Object* pCSObj, CPDF_Dictionary* pResources);

- CPDF_ColorSpace* GetCopiedColorSpace(CPDF_Object* pCSObj);

- void ReleaseColorSpace(CPDF_Object* pColorSpace);

- CPDF_Pattern* GetPattern(CPDF_Object* pPatternObj, FX_BOOL bShading, const CFX_AffineMatrix* matrix);

- void ReleasePattern(CPDF_Object* pPatternObj);

- CPDF_Image* GetImage(CPDF_Object* pImageStream);

- void ReleaseImage(CPDF_Object* pImageStream);

- CPDF_IccProfile* GetIccProfile(CPDF_Stream* pIccProfileStream, FX_INT32 nComponents);

- void ReleaseIccProfile(CPDF_Stream* pIccProfileStream, CPDF_IccProfile* pIccProfile);

- CPDF_StreamAcc* GetFontFileStreamAcc(CPDF_Stream* pFontStream);

- void ReleaseFontFileStreamAcc(CPDF_Stream* pFontStream, FX_BOOL bForce = FALSE);

- CPDF_Document* m_pPDFDoc;

- CPDF_FontMap m_FontMap;

- CPDF_ColorSpaceMap m_ColorSpaceMap;

- CPDF_PatternMap m_PatternMap;

- CPDF_ImageMap m_ImageMap;

- CPDF_IccProfileMap m_IccProfileMap;

- CFX_MapByteStringToPtr m_HashProfileMap;

- CPDF_FontFileMap m_FontFileMap;

+ void Clear(FX_BOOL bRelease = FALSE);

+ CPDF_Font* GetFont(CPDF_Dictionary* pFontDict, FX_BOOL findOnly);

+ CPDF_Font* GetStandardFont(FX_BSTR fontName, CPDF_FontEncoding* pEncoding);

+ void ReleaseFont(CPDF_Dictionary* pFontDict);

+ CPDF_ColorSpace* GetColorSpace(CPDF_Object* pCSObj, CPDF_Dictionary* pResources);

+ CPDF_ColorSpace* GetCopiedColorSpace(CPDF_Object* pCSObj);

+ void ReleaseColorSpace(CPDF_Object* pColorSpace);

+ CPDF_Pattern* GetPattern(CPDF_Object* pPatternObj, FX_BOOL bShading, const CFX_AffineMatrix* matrix);

+ void ReleasePattern(CPDF_Object* pPatternObj);

+ CPDF_Image* GetImage(CPDF_Object* pImageStream);

+ void ReleaseImage(CPDF_Object* pImageStream);

+ CPDF_IccProfile* GetIccProfile(CPDF_Stream* pIccProfileStream, FX_INT32 nComponents);

+ void ReleaseIccProfile(CPDF_Stream* pIccProfileStream, CPDF_IccProfile* pIccProfile);

+ CPDF_StreamAcc* GetFontFileStreamAcc(CPDF_Stream* pFontStream);

+ void ReleaseFontFileStreamAcc(CPDF_Stream* pFontStream, FX_BOOL bForce = FALSE);

+ FX_BOOL IsForceClear() const {return m_bForceClear;}

Tom Sepez 2014/08/18 22:38:58 nit: the m_ members should be protected: given the

+ CPDF_Document* m_pPDFDoc;

+ CPDF_FontMap m_FontMap;

+ CPDF_ColorSpaceMap m_ColorSpaceMap;

+ CPDF_PatternMap m_PatternMap;

+ CPDF_ImageMap m_ImageMap;

+ CPDF_IccProfileMap m_IccProfileMap;

+ CFX_MapByteStringToPtr m_HashProfileMap;

+ CPDF_FontFileMap m_FontFileMap;

+ FX_BOOL m_bForceClear;

};

class CPDF_Function : public CFX_Object

{

« core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp ('K') | « core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp ('k') | no next file » | no next file with comments »