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 /testing | |
| 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 'testing')
| -rw-r--r-- | testing/resources/bug_552046.in | bin | 0 -> 624 bytes |
| -rw-r--r-- | testing/resources/bug_552046.pdf | bin | 0 -> 746 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/testing/resources/bug_552046.in b/testing/resources/bug_552046.in Binary files differnew file mode 100644 index 0000000000..2afc252c75 --- /dev/null +++ b/testing/resources/bug_552046.in diff --git a/testing/resources/bug_552046.pdf b/testing/resources/bug_552046.pdf Binary files differnew file mode 100644 index 0000000000..a60432dc95 --- /dev/null +++ b/testing/resources/bug_552046.pdf |