From 437c23363b9be8d681e5ba76827b2fb5af53c8bf Mon Sep 17 00:00:00 2001 From: Oliver Chang Date: Thu, 12 Nov 2015 10:52:54 -0800 Subject: 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 . --- testing/resources/bug_552046.in | Bin 0 -> 624 bytes testing/resources/bug_552046.pdf | Bin 0 -> 746 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 testing/resources/bug_552046.in create mode 100644 testing/resources/bug_552046.pdf (limited to 'testing/resources') diff --git a/testing/resources/bug_552046.in b/testing/resources/bug_552046.in new file mode 100644 index 0000000000..2afc252c75 Binary files /dev/null and b/testing/resources/bug_552046.in differ diff --git a/testing/resources/bug_552046.pdf b/testing/resources/bug_552046.pdf new file mode 100644 index 0000000000..a60432dc95 Binary files /dev/null and b/testing/resources/bug_552046.pdf differ -- cgit v1.2.3