From 32af0d60cad2d7575698495b931c11f2d619fc47 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 1 Jul 2015 16:27:42 -0700 Subject: Merge to XFA: "Redo range check in CPDF_SampledFunc::v_Call()."" Original Review URL: https://codereview.chromium.org/1214403002. (cherry picked from commit 0b0f2130e403aaa558a04ffa664e6f4f0f38d1b1) BUG=471990 TBR=jun_fang@foxitsoftware.com Review URL: https://codereview.chromium.org/1218273002. --- core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp') diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp index 0ee7a0da7d..9e6ca67041 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp @@ -950,11 +950,14 @@ FX_BOOL CPDF_SeparationCS::v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) return FALSE; } m_pAltCS = Load(pDoc, pAltCS); + if (!m_pAltCS) { + return FALSE; + } CPDF_Object* pFuncObj = pArray->GetElementValue(3); if (pFuncObj && pFuncObj->GetType() != PDFOBJ_NAME) { m_pFunc = CPDF_Function::Load(pFuncObj); } - if (m_pFunc && m_pAltCS && m_pFunc->CountOutputs() < m_pAltCS->CountComponents()) { + if (m_pFunc && m_pFunc->CountOutputs() < m_pAltCS->CountComponents()) { delete m_pFunc; m_pFunc = NULL; } -- cgit v1.2.3