summaryrefslogtreecommitdiff
path: root/core/include/fpdfapi/fpdf_objects.h
diff options
context:
space:
mode:
authorOliver Chang <ochang@chromium.org>2015-11-12 10:52:54 -0800
committerOliver Chang <ochang@chromium.org>2015-11-12 10:52:54 -0800
commit437c23363b9be8d681e5ba76827b2fb5af53c8bf (patch)
tree1096293c194c527c45f0814f0bca7367069e9761 /core/include/fpdfapi/fpdf_objects.h
parent76bc23415f626ad51cfc73f0fb5a4e13c3a4f73f (diff)
downloadpdfium-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/include/fpdfapi/fpdf_objects.h')
-rw-r--r--core/include/fpdfapi/fpdf_objects.h2
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);