diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2015-10-26 16:14:23 -0400 |
|---|---|---|
| committer | Dan Sinclair <dsinclair@chromium.org> | 2015-10-26 16:14:23 -0400 |
| commit | 85361b227ad6786d2aeef8409b79a8d077a26ee9 (patch) | |
| tree | fe1ecb088ee13e6a8104183d4777d8fd3e216771 /core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp | |
| parent | 6ee3484bcb413f4cce303e237fe15e2bdaf51ade (diff) | |
| download | pdfium-85361b227ad6786d2aeef8409b79a8d077a26ee9.tar.xz | |
Make m_pShadingObj a CPDF_Stream instead of CPDF_Object.
This object is required to be a stream and was being converted as such. With
the new type checking this caused us to pass a nullptr where previously we'd
have, incorrectly, cast a CPDF_Dictionary to a CPDF_Stream.
This CL changes the m_pShadingObj to always be a CPDF_Stream. Then, we never
go down the bad code path because we check if m_pShadingObj is nullptr earlier
and bail out.
BUG=chromium:547706
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1426713002 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp')
| -rw-r--r-- | core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp | 4 |
1 files changed, 2 insertions, 2 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..d06f481138 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp @@ -71,12 +71,12 @@ CPDF_ShadingPattern::CPDF_ShadingPattern(CPDF_Document* pDoc, CPDF_Dictionary* pDict = m_pPatternObj->GetDict(); ASSERT(pDict != NULL); m_Pattern2Form = pDict->GetMatrix(FX_BSTRC("Matrix")); - m_pShadingObj = pDict->GetElementValue(FX_BSTRC("Shading")); + m_pShadingObj = ToStream(pDict->GetElementValue(FX_BSTRC("Shading"))); if (parentMatrix) { m_Pattern2Form.Concat(*parentMatrix); } } else { - m_pShadingObj = pPatternObj; + m_pShadingObj = ToStream(pPatternObj); } m_ShadingType = 0; m_pCS = NULL; |