core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp - Issue 361553002: Remove "this==NULL" and adjust corresponding callers

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp

Issue 361553002: Remove "this==NULL" and adjust corresponding callers (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: fix if check warning Created 6 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp

diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp

index 39241e10f4540515cd64346b43c27a05ab71c9a5..1452b9d9f966f376710898295e855dbc1fcb1963 100644

--- a/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp

+++ b/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp

@@ -1082,7 +1082,11 @@ CFX_DIBitmap* CPDF_RenderStatus::LoadSMask(CPDF_Dictionary* pSMaskDict,

CPDF_Array* pBC = pSMaskDict->GetArray(FX_BSTRC("BC"));

FX_ARGB back_color = 0xff000000;

if (pBC) {

- pCSObj = pGroup->GetDict()->GetDict(FX_BSTRC("Group"))->GetElementValue(FX_BSTRC("CS"));

+ CPDF_Dictionary* pDict = pGroup->GetDict();

+ if (pDict && pDict->GetDict(FX_BSTRC("Group")))

+ pCSObj = pDict->GetDict(FX_BSTRC("Group"))->GetElementValue(FX_BSTRC("CS"));

+ else

+ pCSObj = NULL;

pCS = m_pContext->m_pDocument->LoadColorSpace(pCSObj);

if (pCS) {

FX_FLOAT R, G, B;