diff options
author | Lei Zhang <thestig@chromium.org> | 2015-06-19 17:26:17 -0700 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-06-19 17:26:17 -0700 |
commit | 6d8b1c2c7b1cbada20109f70ae971a4192330bb5 (patch) | |
tree | e755b7cb2624622cba606134493d25fb7f1ce6c8 /core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp | |
parent | 9883a7da2d4f31910073c03e703d5b97a45d9254 (diff) | |
download | pdfium-6d8b1c2c7b1cbada20109f70ae971a4192330bb5.tar.xz |
Merge to XFA: Cleanup: Do not check pointers before deleting them.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1192743004.
(cherry picked from commit cfac954abcab7caf47d3fa3d641c553cba998271)
Review URL: https://codereview.chromium.org/1196783003.
Diffstat (limited to 'core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp')
-rw-r--r-- | core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp index bd53874af4..48b3a40495 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp @@ -34,10 +34,8 @@ CPDF_TilingPattern::CPDF_TilingPattern(CPDF_Document* pDoc, CPDF_Object* pPatter } CPDF_TilingPattern::~CPDF_TilingPattern() { - if (m_pForm) { - delete m_pForm; - m_pForm = NULL; - } + delete m_pForm; + m_pForm = NULL; } FX_BOOL CPDF_TilingPattern::Load() { @@ -92,9 +90,7 @@ CPDF_ShadingPattern::~CPDF_ShadingPattern() void CPDF_ShadingPattern::Clear() { for (int i = 0; i < m_nFuncs; i ++) { - if (m_pFunctions[i]) { - delete m_pFunctions[i]; - } + delete m_pFunctions[i]; m_pFunctions[i] = NULL; } CPDF_ColorSpace* pCS = m_pCountedCS ? m_pCountedCS->get() : NULL; @@ -117,9 +113,7 @@ FX_BOOL CPDF_ShadingPattern::Load() } if (m_nFuncs) { for (int i = 0; i < m_nFuncs; i ++) - if (m_pFunctions[i]) { - delete m_pFunctions[i]; - } + delete m_pFunctions[i]; m_nFuncs = 0; } CPDF_Object* pFunc = pShadingDict->GetElementValue(FX_BSTRC("Function")); |