diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-08-14 22:22:13 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-08-14 22:22:13 -0700 |
| commit | da180e9fdd4385df024cc18046f62ca47bc74d74 (patch) | |
| tree | 931e0e64ac2cbc82e3718e43418ee6bd676da4a5 /core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp | |
| parent | 2b1a2d528469cda4e9f3e36d3c7a649e0d476480 (diff) | |
| download | pdfium-da180e9fdd4385df024cc18046f62ca47bc74d74.tar.xz | |
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 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp')
| -rw-r--r-- | core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp index d4deb1df3b..eed62013f5 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; @@ -1101,12 +1097,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) { |