core/src/fpdfapi/fpdf_edit/fpdf_edit_create.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_edit/fpdf_edit_create.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_edit/fpdf_edit_create.cpp

diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp b/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp

index bdbcccdf06dc5d47cc9832e2648e85a6524743db..9eec7aa4a8317dbd9374d24d23e8bc277e6e8c55 100644

--- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp

+++ b/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp

@@ -334,7 +334,7 @@ void CPDF_FlateEncoder::CloneDict()

FX_BOOL CPDF_FlateEncoder::Initialize(CPDF_Stream* pStream, FX_BOOL bFlateEncode)

{

m_Acc.LoadAllData(pStream, TRUE);

- if (pStream->GetDict()->KeyExist("Filter") || !bFlateEncode) {

+ if ((pStream && pStream->GetDict() && pStream->GetDict()->KeyExist("Filter")) || !bFlateEncode) {

if (pStream->GetDict()->KeyExist("Filter") && !bFlateEncode) {

CPDF_StreamAcc destAcc;

destAcc.LoadAllData(pStream);

@@ -1482,7 +1482,8 @@ FX_INT32 CPDF_Creator::WriteDoc_Stage1(IFX_Pause *pPause)

if (m_bSecurityChanged && (m_dwFlags & FPDFCREATE_NO_ORIGINAL) == 0) {

m_dwFlags &= ~FPDFCREATE_INCREMENTAL;

}

- m_pMetadata = m_pDocument->GetRoot()->GetElementValue(FX_BSTRC("Metadata"));

+ CPDF_Dictionary* pDict = m_pDocument->GetRoot();

+ m_pMetadata = pDict ? pDict->GetElementValue(FX_BSTRC("Metadata")) : NULL;

if (m_dwFlags & FPDFCREATE_OBJECTSTREAM) {

m_pXRefStream = FX_NEW CPDF_XRefStream;

m_pXRefStream->Start();

@@ -2032,7 +2033,7 @@ void CPDF_Creator::InitID(FX_BOOL bDefault )

if (!m_pIDArray) {

FX_LPDWORD pBuffer = NULL;

m_pIDArray = CPDF_Array::Create();

- CPDF_Object* pID1 = pOldIDArray->GetElement(0);

+ CPDF_Object* pID1 = pOldIDArray ? pOldIDArray->GetElement(0) : NULL;

if (pID1) {

m_pIDArray->Add(pID1->Clone());

} else {