diff options
| author | Oliver Chang <ochang@chromium.org> | 2015-11-12 10:43:27 -0800 |
|---|---|---|
| committer | Oliver Chang <ochang@chromium.org> | 2015-11-12 10:43:27 -0800 |
| commit | 182d129bcee8f7731b9bbfde0064295ad3b37271 (patch) | |
| tree | 19368ad1af8518f01aecc2c20920490135d7694e /core/include/fpdfapi | |
| parent | 0d5d104521173ff740f2f92ea768ff7f362f731a (diff) | |
| download | pdfium-182d129bcee8f7731b9bbfde0064295ad3b37271.tar.xz | |
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
R=jun_fang@foxitsoftware.com, tsepez@chromium.org
Review URL: https://codereview.chromium.org/1406943005 .
Diffstat (limited to 'core/include/fpdfapi')
| -rw-r--r-- | core/include/fpdfapi/fpdf_objects.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/include/fpdfapi/fpdf_objects.h b/core/include/fpdfapi/fpdf_objects.h index 11589e65a2..b754ab2b2b 100644 --- a/core/include/fpdfapi/fpdf_objects.h +++ b/core/include/fpdfapi/fpdf_objects.h @@ -323,7 +323,7 @@ class CPDF_Array : public CPDF_Object { CPDF_Object* pObj, CPDF_IndirectObjects* pObjs = NULL); - void RemoveAt(FX_DWORD index); + void RemoveAt(FX_DWORD index, int nCount = 1); void Add(CPDF_Object* pObj, CPDF_IndirectObjects* pObjs = NULL); |