diff options
| author | Oliver Chang <ochang@chromium.org> | 2015-11-12 10:52:54 -0800 |
|---|---|---|
| committer | Oliver Chang <ochang@chromium.org> | 2015-11-12 10:52:54 -0800 |
| commit | 437c23363b9be8d681e5ba76827b2fb5af53c8bf (patch) | |
| tree | 1096293c194c527c45f0814f0bca7367069e9761 /core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp | |
| parent | 76bc23415f626ad51cfc73f0fb5a4e13c3a4f73f (diff) | |
| download | pdfium-437c23363b9be8d681e5ba76827b2fb5af53c8bf.tar.xz | |
Merge to XFA: Clear decoders after the image decoder in the /Filter array.
During decoding, when an image decoder is encountered, any
subsequent decoders are ignored, but remain in the array. However,
later on CPDF_DIBSource::ValidateDictParam expects the image
decoder to be the last in the array, causing issues.
A check is also added in CPDF_DIBSource::GetScanline to ensure
that the calculated pitch value is <= the (4-aligned) pitch value in the
cached bitmap to prevent future issues.
Also cleans up some NULL usages.
BUG=552046
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1406943005 .
(cherry picked from commit 182d129bcee8f7731b9bbfde0064295ad3b37271)
Review URL: https://codereview.chromium.org/1436153003 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp')
| -rw-r--r-- | core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp index 990bf5f0e2..edf80d0618 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, |