diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2015-10-27 12:19:11 -0400 |
|---|---|---|
| committer | Dan Sinclair <dsinclair@chromium.org> | 2015-10-27 12:19:11 -0400 |
| commit | 431ba1865443e5cba4dabc74e61ece4daba11b5b (patch) | |
| tree | 39ed3ce4e0d1b36c0fe9ffce6a0d0a2925fb4ea0 /core/src/fpdfapi/fpdf_page | |
| parent | 88e28aa259bc0f318cccf17eebabd3c887a15a46 (diff) | |
| download | pdfium-431ba1865443e5cba4dabc74e61ece4daba11b5b.tar.xz | |
Merge to XFA: Type check the m_pShadingObj before assuming it's a stream.
The m_pShadingObj can be a stream or a dictionary depending on how it's used.
This CL adds some simple type checking to make sure that the type of the
object matches what we expect.
BUG=chromium:547706
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1421973004 .
(cherry picked from commit 4ef782ab57979add3e3910d6bcfde6ef59f65724)
Review URL: https://codereview.chromium.org/1422253002 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_page')
| -rw-r--r-- | core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp index 7b04d8cd33..ded6c878ea 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp @@ -140,6 +140,11 @@ FX_BOOL CPDF_ShadingPattern::Load() { m_pCountedCS = pDocPageData->FindColorSpacePtr(m_pCS->GetArray()); } m_ShadingType = pShadingDict->GetInteger(FX_BSTRC("ShadingType")); + + // We expect to have a stream if our shading type is a mesh. + if (m_ShadingType >= 4 && !ToStream(m_pShadingObj)) + return FALSE; + return TRUE; } FX_BOOL CPDF_ShadingPattern::Reload() { |