diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-07-01 16:14:29 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-07-01 16:14:29 -0700 |
| commit | 0b0f2130e403aaa558a04ffa664e6f4f0f38d1b1 (patch) | |
| tree | 0a1961ed42939add5824cb88101a8e26d426b0db /core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp | |
| parent | ae195a4242a81899708eb58e109fd0d1a9cbbeeb (diff) | |
| download | pdfium-0b0f2130e403aaa558a04ffa664e6f4f0f38d1b1.tar.xz | |
Revert "Revert "Redo range check in CPDF_SampledFunc::v_Call().""
This reverts commit 327080bacabb3d90094144e66ae57037d4a8d8e6.
This re-lands the patch, but removes the tests which would require
512MB buffers to be reliably allocatable on small bots. It
also adds
small fixes accumulated while diagnosing it.
R=sanqingsong@gmail.com
Review URL: https://codereview.chromium.org/1214403002.
Diffstat (limited to 'core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp')
| -rw-r--r-- | core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
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; } |