summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-07-16 18:45:22 -0700
committerLei Zhang <thestig@chromium.org>2015-07-16 18:45:22 -0700
commit796c908e7b7bdde819a1e5a4bfd3576d8e8859d6 (patch)
tree8c0cd763dd9bf70bc14da8f8cb7893835a3572fe /core
parentba026913c273a5c1c841bced288fdab03f10ad08 (diff)
downloadpdfium-796c908e7b7bdde819a1e5a4bfd3576d8e8859d6.tar.xz
Merge to XFA: Cleanup: Do not check pointers before deleting them, part 2.
R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1195363002 . (cherry picked from commit 21bf242a31eff79f754c5e9c3b41c52e33483bb0) Review URL: https://codereview.chromium.org/1235753006 .
Diffstat (limited to 'core')
-rw-r--r--core/src/fpdfapi/fpdf_render/fpdf_render.cpp20
-rw-r--r--core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp28
-rw-r--r--core/src/fxcodec/jbig2/JBig2_GeneralDecoder.cpp12
-rw-r--r--core/src/fxge/agg/src/fx_agg_driver.cpp4
-rw-r--r--core/src/fxge/android/fpf_skiamodule.cpp6
-rw-r--r--core/src/fxge/apple/fx_mac_imp.cpp4
-rw-r--r--core/src/fxge/win32/fx_win32_device.cpp4
-rw-r--r--core/src/fxge/win32/fx_win32_dwrite.cpp4
8 files changed, 21 insertions, 61 deletions
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render.cpp
index c4a9d7761b..a894e846ee 100644
--- a/core/src/fpdfapi/fpdf_render/fpdf_render.cpp
+++ b/core/src/fpdfapi/fpdf_render/fpdf_render.cpp
@@ -202,9 +202,7 @@ CPDF_RenderStatus::CPDF_RenderStatus()
CPDF_RenderStatus::~CPDF_RenderStatus()
{
- if (m_pObjectRenderer) {
- delete m_pObjectRenderer;
- }
+ delete m_pObjectRenderer;
}
FX_BOOL CPDF_RenderStatus::Initialize(CPDF_RenderContext* pContext, CFX_RenderDevice* pDevice,
@@ -665,9 +663,7 @@ void CPDF_RenderStatus::ProcessClipPath(CPDF_ClipPath ClipPath, const CFX_Affine
ProcessText(pText, pObj2Device, pTextClippingPath);
}
}
- if (pTextClippingPath) {
- delete pTextClippingPath;
- }
+ delete pTextClippingPath;
}
void CPDF_RenderStatus::DrawClipPath(CPDF_ClipPath ClipPath, const CFX_AffineMatrix* pObj2Device)
{
@@ -859,9 +855,7 @@ FX_BOOL CPDF_RenderStatus::ProcessTransparency(const CPDF_PageObject* pPageObj,
Transparency |= PDFTRANS_GROUP;
}
CompositeDIBitmap(bitmap, rect.left, rect.top, 0, 255, blend_type, Transparency);
- if (oriDevice) {
- delete oriDevice;
- }
+ delete oriDevice;
return TRUE;
}
CFX_DIBitmap* CPDF_RenderStatus::GetBackdrop(const CPDF_PageObject* pObj, const FX_RECT& rect, int& left, int& top,
@@ -1271,9 +1265,7 @@ CPDF_DeviceBuffer::CPDF_DeviceBuffer()
}
CPDF_DeviceBuffer::~CPDF_DeviceBuffer()
{
- if (m_pBitmap) {
- delete m_pBitmap;
- }
+ delete m_pBitmap;
}
FX_BOOL CPDF_DeviceBuffer::Initialize(CPDF_RenderContext* pContext, CFX_RenderDevice* pDevice, FX_RECT* pRect,
const CPDF_PageObject* pObj, int max_dpi)
@@ -1330,9 +1322,7 @@ CPDF_ScaledRenderBuffer::CPDF_ScaledRenderBuffer()
}
CPDF_ScaledRenderBuffer::~CPDF_ScaledRenderBuffer()
{
- if (m_pBitmapDevice) {
- delete m_pBitmapDevice;
- }
+ delete m_pBitmapDevice;
}
#define _FPDFAPI_IMAGESIZE_LIMIT_ (30 * 1024 * 1024)
FX_BOOL CPDF_ScaledRenderBuffer::Initialize(CPDF_RenderContext* pContext, CFX_RenderDevice* pDevice, FX_RECT* pRect,
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp
index f3f0375f53..0730206e23 100644
--- a/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp
+++ b/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp
@@ -297,21 +297,13 @@ CPDF_ImageRenderer::CPDF_ImageRenderer()
}
CPDF_ImageRenderer::~CPDF_ImageRenderer()
{
- if (m_pQuickStretcher) {
- delete m_pQuickStretcher;
- }
- if (m_pTransformer) {
- delete m_pTransformer;
- }
+ delete m_pQuickStretcher;
+ delete m_pTransformer;
if (m_DeviceHandle) {
m_pRenderStatus->m_pDevice->CancelDIBits(m_DeviceHandle);
}
- if (m_LoadHandle) {
- delete (CPDF_ProgressiveImageLoaderHandle*)m_LoadHandle;
- }
- if (m_pClone) {
- delete m_pClone;
- }
+ delete (CPDF_ProgressiveImageLoaderHandle*)m_LoadHandle;
+ delete m_pClone;
}
FX_BOOL CPDF_ImageRenderer::StartLoadDIBSource()
{
@@ -813,15 +805,11 @@ CPDF_QuickStretcher::CPDF_QuickStretcher()
}
CPDF_QuickStretcher::~CPDF_QuickStretcher()
{
- if (m_pBitmap) {
- delete m_pBitmap;
- }
+ delete m_pBitmap;
if (m_pCS) {
m_pCS->ReleaseCS();
}
- if (m_pDecoder) {
- delete m_pDecoder;
- }
+ delete m_pDecoder;
}
ICodec_ScanlineDecoder* FPDFAPI_CreateFlateDecoder(const uint8_t* src_buf, FX_DWORD src_size, int width, int height,
int nComps, int bpc, const CPDF_Dictionary* pParams);
@@ -1085,9 +1073,7 @@ CFX_DIBitmap* CPDF_RenderStatus::LoadSMask(CPDF_Dictionary* pSMaskDict,
} else {
FXSYS_memcpy(dest_buf, src_buf, dest_pitch * height);
}
- if (pFunc) {
- delete pFunc;
- }
+ delete pFunc;
FX_Free(pTransfer);
return pMask;
}
diff --git a/core/src/fxcodec/jbig2/JBig2_GeneralDecoder.cpp b/core/src/fxcodec/jbig2/JBig2_GeneralDecoder.cpp
index 929180e0b5..622f04b160 100644
--- a/core/src/fxcodec/jbig2/JBig2_GeneralDecoder.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_GeneralDecoder.cpp
@@ -3027,9 +3027,7 @@ CJBig2_SymbolDict *CJBig2_SDDProc::decode_Huffman(CJBig2_BitStream *pStream,
return pDict;
failed:
for(I = 0; I < NSYMSDECODED; I++) {
- if (SDNEWSYMS[I]) {
- delete SDNEWSYMS[I];
- }
+ delete SDNEWSYMS[I];
}
m_pModule->JBig2_Free(SDNEWSYMS);
if(SDREFAGG == 0) {
@@ -3094,15 +3092,11 @@ CJBig2_Image *CJBig2_HTRDProc::decode_Arith(CJBig2_ArithDecoder *pArithDecoder,
}
}
m_pModule->JBig2_Free(GI);
- if(HSKIP) {
- delete HSKIP;
- }
+ delete HSKIP;
delete pGID;
return HTREG;
failed:
- if(HSKIP) {
- delete HSKIP;
- }
+ delete HSKIP;
delete pGID;
delete HTREG;
return NULL;
diff --git a/core/src/fxge/agg/src/fx_agg_driver.cpp b/core/src/fxge/agg/src/fx_agg_driver.cpp
index cb01893d5b..045d586924 100644
--- a/core/src/fxge/agg/src/fx_agg_driver.cpp
+++ b/core/src/fxge/agg/src/fx_agg_driver.cpp
@@ -207,9 +207,7 @@ CFX_AggDeviceDriver::~CFX_AggDeviceDriver()
{
delete m_pClipRgn;
for (int i = 0; i < m_StateStack.GetSize(); i ++)
- if (m_StateStack[i]) {
- delete (CFX_ClipRgn*)m_StateStack[i];
- }
+ delete (CFX_ClipRgn*)m_StateStack[i];
DestroyPlatform();
}
#if _FXM_PLATFORM_ != _FXM_PLATFORM_APPLE_
diff --git a/core/src/fxge/android/fpf_skiamodule.cpp b/core/src/fxge/android/fpf_skiamodule.cpp
index 1d365472e3..be84fcfd0e 100644
--- a/core/src/fxge/android/fpf_skiamodule.cpp
+++ b/core/src/fxge/android/fpf_skiamodule.cpp
@@ -22,10 +22,8 @@ CFPF_SkiaDeviceModule::~CFPF_SkiaDeviceModule()
}
void CFPF_SkiaDeviceModule::Destroy()
{
- if (gs_pPFModule) {
- delete (CFPF_SkiaDeviceModule*)gs_pPFModule;
- gs_pPFModule = NULL;
- }
+ delete (CFPF_SkiaDeviceModule*)gs_pPFModule;
+ gs_pPFModule = NULL;
}
IFPF_FontMgr* CFPF_SkiaDeviceModule::GetFontMgr()
{
diff --git a/core/src/fxge/apple/fx_mac_imp.cpp b/core/src/fxge/apple/fx_mac_imp.cpp
index 38ef02c90f..952af93b60 100644
--- a/core/src/fxge/apple/fx_mac_imp.cpp
+++ b/core/src/fxge/apple/fx_mac_imp.cpp
@@ -103,9 +103,7 @@ void CFX_GEModule::InitPlatform()
}
void CFX_GEModule::DestroyPlatform()
{
- if (m_pPlatformData) {
- delete (CApplePlatform *) m_pPlatformData;
- }
+ delete (CApplePlatform *)m_pPlatformData;
m_pPlatformData = NULL;
}
#endif
diff --git a/core/src/fxge/win32/fx_win32_device.cpp b/core/src/fxge/win32/fx_win32_device.cpp
index b7dced9148..2802a7c533 100644
--- a/core/src/fxge/win32/fx_win32_device.cpp
+++ b/core/src/fxge/win32/fx_win32_device.cpp
@@ -413,9 +413,7 @@ void CFX_GEModule::InitPlatform()
}
void CFX_GEModule::DestroyPlatform()
{
- if (m_pPlatformData) {
- delete (CWin32Platform*)m_pPlatformData;
- }
+ delete (CWin32Platform*)m_pPlatformData;
m_pPlatformData = NULL;
}
CGdiDeviceDriver::CGdiDeviceDriver(HDC hDC, int device_class)
diff --git a/core/src/fxge/win32/fx_win32_dwrite.cpp b/core/src/fxge/win32/fx_win32_dwrite.cpp
index 28846667e5..7949888ac2 100644
--- a/core/src/fxge/win32/fx_win32_dwrite.cpp
+++ b/core/src/fxge/win32/fx_win32_dwrite.cpp
@@ -266,9 +266,7 @@ FX_BOOL CDWriteExt::DwRendingString(void* renderTarget, CFX_ClipRgn* pClipRgn, F
}
void CDWriteExt::DwDeleteRenderingTarget(void* renderTarget)
{
- if (renderTarget) {
- delete (CDwGdiTextRenderer*)renderTarget;
- }
+ delete (CDwGdiTextRenderer*)renderTarget;
}
void CDWriteExt::DwDeleteFont(void* pFont)
{