Add m_pDocument in CPDF_Color and check if page date has been forced clear

core/include/fpdfapi/fpdf_resource.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 _FPDF_RESOURCE_
 #define _FPDF_RESOURCE_
 #ifndef _FPDF_PARSER_
 #include "fpdf_parser.h"
@@ skipping 664 matching lines @@
     CPDF_Array*                         m_pArray;
 
     FX_DWORD                            m_dwStdConversion;
 };
 class CPDF_Color : public CFX_Object
 {
 public:
 
     CPDF_Color()
     {
         m_pBuffer = NULL;

[Tom Sepez, 2014/09/02 17:15:49]

Nit: can we clear these in the same order as which they are declared n the
class?

[Bo Xu, 2014/09/02 19:05:34]

Done.

         m_pCS = NULL;
+        m_pDocument = NULL;
     }
 
     CPDF_Color(int family);
 
     ~CPDF_Color();
 
     FX_BOOL                                     IsNull() const
     {
         return m_pBuffer == NULL;
     }
@@ skipping 17 matching lines @@
 
     CPDF_Pattern*                       GetPattern() const;
 
     CPDF_ColorSpace*            GetPatternCS() const;
 
     FX_FLOAT*                   GetPatternColor() const;
 
     CPDF_ColorSpace*            m_pCS;
 
     FX_FLOAT*                   m_pBuffer;
+

[Tom Sepez, 2014/09/02 17:15:49]

nit: can this be protected/private?

[Bo Xu, 2014/09/02 19:05:34]

Done.

+    CPDF_Document*          m_pDocument;

[Tom Sepez, 2014/09/02 17:15:49]

Are we sure that the document will still be valid when this color is destructed?

[Tom Sepez, 2014/09/02 17:17:12]

In other words,
Are we sure that the document will still be valid up untl this color is
destructed?

[Bo Xu, 2014/09/02 19:05:34]

Yes, the destrutor of color is in the destructor of CPDF_Document at line 96 of
fpdf_parser_document.cpp.

The lifetime of m_pDocument is until the very end at FPDF_CloseDocument()when
most of other resources has been released.

+
 protected:
     void        ReleaseBuffer();
     void        ReleaseColorSpace();
 };
 #define PATTERN_TILING          1
 #define PATTERN_SHADING         2
 class CPDF_Pattern : public CFX_Object
 {
 public:
    
     virtual ~CPDF_Pattern();
-    void SaveColor(CPDF_Color* pColor) {m_pColor = pColor;}
 
     CPDF_Object*                m_pPatternObj;
 
     int                         m_PatternType;
 
     CFX_AffineMatrix            m_Pattern2Form;
     CFX_AffineMatrix            m_ParentMatrix;
 
     CPDF_Document*              m_pDocument;
-    CPDF_Color*                 m_pColor;
 
 protected:
     
     CPDF_Pattern(const CFX_AffineMatrix* pParentMatrix);
 };
 
 class CPDF_TilingPattern : public CPDF_Pattern
 {
 public:
 
@@ skipping 193 matching lines @@
     FX_BOOL                                     m_bIsMask;
 
     FX_BOOL                                     m_bInterpolate;
 
     CPDF_Document*                      m_pDocument;
 
     CPDF_Dictionary*            m_pOC;
     CPDF_Dictionary*    InitJPEG(FX_LPBYTE pData, FX_DWORD size);
 };
 #endif