diff options
| author | Bo Xu <bo_xu@foxitsoftware.com> | 2014-12-10 16:00:29 -0800 |
|---|---|---|
| committer | Bo Xu <bo_xu@foxitsoftware.com> | 2014-12-10 16:11:06 -0800 |
| commit | 17d734e2c0d2852bbfd4e93c54f21ead6e67c12a (patch) | |
| tree | 884c9ff78d8c0a046d9d7d5f79853466b2b2e60a | |
| parent | ea02bddce0b29dd8842170856a1519f21d5e8181 (diff) | |
| download | pdfium-17d734e2c0d2852bbfd4e93c54f21ead6e67c12a.tar.xz | |
Merge to XFA: patch from CL 791223002
Lab colorspace needs to be 3 component
BUG=429134
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/791223002
| -rw-r--r-- | core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp | 1 | ||||
| -rw-r--r-- | core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp index 5266c1a052..670465673b 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp @@ -456,6 +456,7 @@ FX_BOOL CPDF_LabCS::v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) } void CPDF_LabCS::GetDefaultValue(int iComponent, FX_FLOAT& value, FX_FLOAT& min, FX_FLOAT& max) const { + assert(iComponent < 3); value = 0; if (iComponent == 0) { min = 0; diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp index d2910dc1ab..c5a96d67f4 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp @@ -583,6 +583,10 @@ int CPDF_DIBSource::CreateDecoder() if (m_nComponents != comps) { FX_Free(m_pCompData); m_nComponents = comps; + if (m_Family == PDFCS_LAB && m_nComponents != 3) { + m_pCompData = NULL; + return 0; + } m_pCompData = GetDecodeAndMaskArray(m_bDefaultDecode, m_bColorKey); if (m_pCompData == NULL) { return 0; |