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.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.cpp')
| -rw-r--r-- | core/src/fpdfapi/fpdf_page/fpdf_page.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page.cpp index 85c785fd22..db3966ec17 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page.cpp @@ -697,9 +697,7 @@ void CPDF_ShadingObject::CalcBoundingBox() } CPDF_FormObject::~CPDF_FormObject() { - if (m_pForm) { - delete m_pForm; - } + delete m_pForm; } void CPDF_FormObject::Transform(const CFX_AffineMatrix& matrix) { @@ -709,9 +707,7 @@ void CPDF_FormObject::Transform(const CFX_AffineMatrix& matrix) void CPDF_FormObject::CopyData(const CPDF_PageObject* pSrc) { const CPDF_FormObject* pSrcObj = (const CPDF_FormObject*)pSrc; - if (m_pForm) { - delete m_pForm; - } + delete m_pForm; m_pForm = pSrcObj->m_pForm->Clone(); m_FormMatrix = pSrcObj->m_FormMatrix; } @@ -735,9 +731,7 @@ CPDF_PageObjects::CPDF_PageObjects(FX_BOOL bReleaseMembers) : m_ObjectList(128) } CPDF_PageObjects::~CPDF_PageObjects() { - if (m_pParser) { - delete m_pParser; - } + delete m_pParser; if (!m_bReleaseMembers) { return; } @@ -851,9 +845,7 @@ void CPDF_PageObjects::LoadTransInfo() void CPDF_PageObjects::ClearCacheObjects() { m_ParseState = PDF_CONTENT_NOT_PARSED; - if (m_pParser) { - delete m_pParser; - } + delete m_pParser; m_pParser = NULL; if (m_bReleaseMembers) { FX_POSITION pos = m_ObjectList.GetHeadPosition(); |