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_edit/fpdf_edit_create.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_edit/fpdf_edit_create.cpp')
-rw-r--r-- | core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp b/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp index b7eb05f452..22826a3609 100644 --- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp +++ b/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp @@ -1967,10 +1967,8 @@ int32_t CPDF_Creator::WriteDoc_Stage4(IFX_Pause *pPause) } void CPDF_Creator::Clear() { - if (m_pXRefStream) { - delete m_pXRefStream; - m_pXRefStream = NULL; - } + delete m_pXRefStream; + m_pXRefStream = NULL; m_File.Clear(); m_NewObjNumArray.RemoveAll(); if (m_pIDArray) { @@ -2068,7 +2066,7 @@ void CPDF_Creator::InitID(FX_BOOL bDefault ) CFX_ByteString user_pass = m_pParser->GetPassword(); FX_DWORD flag = PDF_ENCRYPT_CONTENT; handler.OnCreate(m_pEncryptDict, m_pIDArray, (const uint8_t*)user_pass, user_pass.GetLength(), flag); - if (m_pCryptoHandler && m_bNewCrypto) { + if (m_bNewCrypto) { delete m_pCryptoHandler; } m_pCryptoHandler = new CPDF_StandardCryptoHandler; @@ -2122,7 +2120,7 @@ void CPDF_Creator::RemoveSecurity() } void CPDF_Creator::ResetStandardSecurity() { - if ((m_bStandardSecurity || m_bNewCrypto) && m_pCryptoHandler) { + if (m_bStandardSecurity || m_bNewCrypto) { delete m_pCryptoHandler; m_pCryptoHandler = NULL; } |