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_parser.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_parser.cpp')
| -rw-r--r-- | core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp index e5d0b6a17b..e78ee4596d 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp @@ -1735,9 +1735,7 @@ CPDF_SyntaxParser::CPDF_SyntaxParser() { m_bFileStream = FALSE; } CPDF_SyntaxParser::~CPDF_SyntaxParser() { - if (m_pFileBuf) { - FX_Free(m_pFileBuf); - } + FX_Free(m_pFileBuf); } FX_BOOL CPDF_SyntaxParser::GetCharAt(FX_FILESIZE pos, uint8_t& ch) { FX_FILESIZE save_pos = m_Pos; @@ -2598,10 +2596,7 @@ CPDF_Stream* CPDF_SyntaxParser::ReadStream(CPDF_Dictionary* pDict, } void CPDF_SyntaxParser::InitParser(IFX_FileRead* pFileAccess, FX_DWORD HeaderOffset) { - if (m_pFileBuf) { - FX_Free(m_pFileBuf); - m_pFileBuf = NULL; - } + FX_Free(m_pFileBuf); m_pFileBuf = FX_Alloc(uint8_t, m_BufSize); m_HeaderOffset = HeaderOffset; m_FileLen = pFileAccess->GetSize(); |