From da180e9fdd4385df024cc18046f62ca47bc74d74 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 14 Aug 2015 22:22:13 -0700 Subject: Merge to XFA: Don't bother checking pointers before delete[] and FX_Free(). R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1297713003 . (cherry picked from commit cb62e7657b3a9a04142028a4e6614029a08e894b) Review URL: https://codereview.chromium.org/1287053005 . --- core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp') diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp index 3c8b2567fe..6c728242e6 100644 --- a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp +++ b/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp @@ -301,15 +301,9 @@ CPDF_CMap::CPDF_CMap() { m_nCodeRanges = 0; } CPDF_CMap::~CPDF_CMap() { - if (m_pMapping) { - FX_Free(m_pMapping); - } - if (m_pAddMapping) { - FX_Free(m_pAddMapping); - } - if (m_pLeadingBytes) { - FX_Free(m_pLeadingBytes); - } + FX_Free(m_pMapping); + FX_Free(m_pAddMapping); + FX_Free(m_pLeadingBytes); delete m_pUseMap; } void CPDF_CMap::Release() { -- cgit v1.2.3