From cb62e7657b3a9a04142028a4e6614029a08e894b Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 14 Aug 2015 15:45:39 -0700 Subject: Don't bother checking pointers before delete[] and FX_Free(). R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1297713003 . --- core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp') diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp index 3830ad68a3..9227536ec7 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp @@ -828,7 +828,7 @@ CPDF_Stream::CPDF_Stream(uint8_t* pData, FX_DWORD size, CPDF_Dictionary* pDict) m_pCryptoHandler = NULL; } CPDF_Stream::~CPDF_Stream() { - if (m_GenNum == (FX_DWORD)-1 && m_pDataBuf != NULL) { + if (m_GenNum == (FX_DWORD)-1) { FX_Free(m_pDataBuf); } if (m_pDict) { @@ -843,9 +843,7 @@ void CPDF_Stream::InitStream(CPDF_Dictionary* pDict) { m_pDict = pDict; } if (m_GenNum == (FX_DWORD)-1) { - if (m_pDataBuf) { - FX_Free(m_pDataBuf); - } + FX_Free(m_pDataBuf); } m_GenNum = 0; m_pFile = NULL; @@ -871,9 +869,7 @@ void CPDF_Stream::SetData(const uint8_t* pData, FX_BOOL bCompressed, FX_BOOL bKeepBuf) { if (m_GenNum == (FX_DWORD)-1) { - if (m_pDataBuf) { - FX_Free(m_pDataBuf); - } + FX_Free(m_pDataBuf); } else { m_GenNum = (FX_DWORD)-1; m_pCryptoHandler = NULL; @@ -1070,12 +1066,10 @@ void CPDF_StreamAcc::LoadAllData(const CPDF_Stream* pStream, m_bNewBuf = m_pData != pStream->m_pDataBuf; } CPDF_StreamAcc::~CPDF_StreamAcc() { - if (m_bNewBuf && m_pData) { + if (m_bNewBuf) { FX_Free(m_pData); } - if (m_pSrcData) { - FX_Free(m_pSrcData); - } + FX_Free(m_pSrcData); } const uint8_t* CPDF_StreamAcc::GetData() const { if (m_bNewBuf) { -- cgit v1.2.3