Chromium Code Reviews| Index: core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp |
| diff --git a/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp |
| index 951d38359f6b3bfcb2dfe0c6f3c85727d8898811..52a6f817f525440b07634f21f1b303399d3d2075 100644 |
| --- a/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp |
| +++ b/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp |
| @@ -570,9 +570,12 @@ int CPDF_DIBSource::CreateDecoder() { |
| bpc, bTransform)) { |
| if (m_nComponents != static_cast<uint32_t>(comps)) { |
| FX_Free(m_pCompData); |
| + m_pCompData = nullptr; |
| m_nComponents = static_cast<uint32_t>(comps); |
| + if (m_pColorSpace && |
| + m_pColorSpace->CountComponents() != m_nComponents) |
| + return 0; |
| if (m_Family == PDFCS_LAB && m_nComponents != 3) { |
|
Tom Sepez
2016/04/15 20:14:49
nit: no {}
Oliver Chang
2016/04/15 20:40:26
Done.
|
| - m_pCompData = nullptr; |
| return 0; |
| } |
| m_pCompData = GetDecodeAndMaskArray(m_bDefaultDecode, m_bColorKey); |