core/src/fpdfapi/fpdf_page/fpdf_page.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_page/fpdf_page.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_page/fpdf_page.cpp

diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page.cpp

index 3cfb93e4bc41dfac1a4646e505e1327c2898fe53..500fe4a57f7bc10f9b98d62acc2758352ec30be2 100644

--- a/core/src/fpdfapi/fpdf_page/fpdf_page.cpp

+++ b/core/src/fpdfapi/fpdf_page/fpdf_page.cpp

@@ -841,7 +841,8 @@ void CPDF_Page::Load(CPDF_Document* pDocument, CPDF_Dictionary* pPageDict, FX_BO

m_pPageResources = m_pResources = NULL;

return;

}

- m_pResources = GetPageAttr(FX_BSTRC("Resources"))->GetDict();

+ CPDF_Object* pageAttr = GetPageAttr(FX_BSTRC("Resources"));

+ m_pResources = pageAttr ? pageAttr->GetDict() : NULL;

m_pPageResources = m_pResources;

CPDF_Object* pRotate = GetPageAttr(FX_BSTRC("Rotate"));

int rotate = 0;

@@ -946,7 +947,7 @@ CPDF_Form::CPDF_Form(CPDF_Document* pDoc, CPDF_Dictionary* pPageResources, CPDF_

{

m_pDocument = pDoc;

m_pFormStream = pFormStream;

- m_pFormDict = pFormStream->GetDict();

+ m_pFormDict = pFormStream ? pFormStream->GetDict() : NULL;

m_pResources = m_pFormDict->GetDict(FX_BSTRC("Resources"));

m_pPageResources = pPageResources;

if (m_pResources == NULL) {