core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp - Issue 1436153003: Merge to XFA: Clear decoders after the image decoder in the /Filter array.

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_parser/fpdf_parser_objects.cpp

Issue 1436153003: Merge to XFA: Clear decoders after the image decoder in the /Filter array. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa

Patch Set: Created 5 years, 1 month ago

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

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp ('k') | core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp

diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp

index 990bf5f0e2cfeaf99dee194726a8c246cc3c44ca..edf80d0618c282849eac08c09f8be78621d97129 100644

--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp

+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp

@@ -496,13 +496,18 @@ CPDF_Stream* CPDF_Array::GetStream(FX_DWORD i) const {

CPDF_Array* CPDF_Array::GetArray(FX_DWORD i) const {

return ToArray(GetElementValue(i));

}

-void CPDF_Array::RemoveAt(FX_DWORD i) {

- ASSERT(IsArray());

+void CPDF_Array::RemoveAt(FX_DWORD i, int nCount) {

if (i >= (FX_DWORD)m_Objects.GetSize())

return;

- if (CPDF_Object* p = static_cast<CPDF_Object*>(m_Objects.GetAt(i)))

- p->Release();

- m_Objects.RemoveAt(i);

+ if (nCount <= 0 || nCount > m_Objects.GetSize() - i)

+ return;

+ for (int j = 0; j < nCount; ++j) {

+ if (CPDF_Object* p = static_cast<CPDF_Object*>(m_Objects.GetAt(i + j)))

+ p->Release();

+ }

+ m_Objects.RemoveAt(i, nCount);

}

void CPDF_Array::SetAt(FX_DWORD i,

CPDF_Object* pObj,