From 6d8b1c2c7b1cbada20109f70ae971a4192330bb5 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 19 Jun 2015 17:26:17 -0700 Subject: 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. --- core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp') diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp index 6362be973b..f115b6770d 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp @@ -460,9 +460,7 @@ CPDF_SampledFunc::CPDF_SampledFunc() } CPDF_SampledFunc::~CPDF_SampledFunc() { - if (m_pSampleStream) { - delete m_pSampleStream; - } + delete m_pSampleStream; if (m_pEncodeInfo) { FX_Free(m_pEncodeInfo); } @@ -713,9 +711,7 @@ CPDF_StitchFunc::CPDF_StitchFunc() CPDF_StitchFunc::~CPDF_StitchFunc() { for (int i = 0; i < m_nSubs; i ++) - if (m_pSubFunctions[i]) { - delete m_pSubFunctions[i]; - } + delete m_pSubFunctions[i]; if (m_pSubFunctions) { FX_Free(m_pSubFunctions); } -- cgit v1.2.3