core/src/fpdftext/fpdf_text_search.cpp - Issue 1520063002: Get rid of most instance of 'foo == NULL'

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/fpdftext/fpdf_text_search.cpp

Issue 1520063002: Get rid of most instance of 'foo == NULL' (Closed) Base URL: https://pdfium.googlesource.com/pdfium@bstr_isnull

Patch Set: rebase Created 5 years 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/fpdftext/fpdf_text_search.cpp

diff --git a/core/src/fpdftext/fpdf_text_search.cpp b/core/src/fpdftext/fpdf_text_search.cpp

index 43486c7ab8accf6f819cc25deb13e2ee8f0aa04b..80bf5ec99ad0052f7676b6eca77098834fd9ca0a 100644

--- a/core/src/fpdftext/fpdf_text_search.cpp

+++ b/core/src/fpdftext/fpdf_text_search.cpp

@@ -303,13 +303,8 @@ void GetTextStream_Unicode(CFX_WideTextBuf& buffer,

FX_POSITION pos = pPage->GetFirstObjectPosition();

while (pos) {

CPDF_PageObject* pObject = pPage->GetNextObject(pos);

- if (pObject == NULL) {

- continue;

- }

- if (pObject->m_Type != PDFPAGE_TEXT) {

- continue;

- }

- textstream.ProcessObject((CPDF_TextObject*)pObject, FALSE);

+ if (pObject && pObject->m_Type == PDFPAGE_TEXT)

+ textstream.ProcessObject((CPDF_TextObject*)pObject, FALSE);

}

CFX_WideString PDF_GetFirstTextLine_Unicode(CPDF_Document* pDoc,

« no previous file with comments | « core/src/fpdftext/fpdf_text_int.cpp ('k') | core/src/fxcodec/codec/fx_codec.cpp » ('j') | no next file with comments »