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/fxcodec/codec/fx_codec.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/fxcodec/codec/fx_codec.cpp')
| -rw-r--r-- | core/src/fxcodec/codec/fx_codec.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/core/src/fxcodec/codec/fx_codec.cpp b/core/src/fxcodec/codec/fx_codec.cpp index 2cfb7469e0..b16beb5de1 100644 --- a/core/src/fxcodec/codec/fx_codec.cpp +++ b/core/src/fxcodec/codec/fx_codec.cpp @@ -25,9 +25,7 @@ CCodec_ScanlineDecoder::CCodec_ScanlineDecoder() { m_pLastScanline = NULL; } CCodec_ScanlineDecoder::~CCodec_ScanlineDecoder() { - if (m_pDataCache) { - FX_Free(m_pDataCache); - } + FX_Free(m_pDataCache); } uint8_t* CCodec_ScanlineDecoder::GetScanline(int line) { if (m_pDataCache && line < m_pDataCache->m_nCachedLines) { @@ -600,9 +598,7 @@ CCodec_RLScanlineDecoder::CCodec_RLScanlineDecoder() m_bEOD(FALSE), m_Operator(0) {} CCodec_RLScanlineDecoder::~CCodec_RLScanlineDecoder() { - if (m_pScanline) { - FX_Free(m_pScanline); - } + FX_Free(m_pScanline); } FX_BOOL CCodec_RLScanlineDecoder::CheckDestSize() { FX_DWORD i = 0; |