From da180e9fdd4385df024cc18046f62ca47bc74d74 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 14 Aug 2015 22:22:13 -0700 Subject: 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 . --- core/src/fxcodec/codec/codec_int.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'core/src/fxcodec/codec/codec_int.h') diff --git a/core/src/fxcodec/codec/codec_int.h b/core/src/fxcodec/codec/codec_int.h index be59655b4e..faf812051a 100644 --- a/core/src/fxcodec/codec/codec_int.h +++ b/core/src/fxcodec/codec/codec_int.h @@ -54,9 +54,7 @@ class CCodec_ScanlineDecoder : public ICodec_ScanlineDecoder { int GetBPC() override { return m_bpc; } FX_BOOL IsColorTransformed() override { return m_bColorTransformed; } void ClearImageData() override { - if (m_pDataCache) { - FX_Free(m_pDataCache); - } + FX_Free(m_pDataCache); m_pDataCache = NULL; } -- cgit v1.2.3