diff options
| author | Henrique Nakashima <hnakashima@chromium.org> | 2018-01-26 15:42:59 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-01-26 15:42:59 +0000 |
| commit | 49363202ce06ca9ff418b4df384cffadf924303c (patch) | |
| tree | 9830590cf450f4bd264ce1cf80921aa46b38da3b | |
| parent | 30f213e89d4e7ff67e09eaae592614cddba0809a (diff) | |
| download | pdfium-49363202ce06ca9ff418b4df384cffadf924303c.tar.xz | |
Fix crash in palette loading with Pattern colorspace.
Bug: chromium:804155
Change-Id: Ie70e93116696e3c4db987a10b8fc31b1af8aea70
Reviewed-on: https://pdfium-review.googlesource.com/23990
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
| -rw-r--r-- | core/fpdfapi/render/cpdf_dibsource.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/core/fpdfapi/render/cpdf_dibsource.cpp b/core/fpdfapi/render/cpdf_dibsource.cpp index c1b96073d9..aff63d102d 100644 --- a/core/fpdfapi/render/cpdf_dibsource.cpp +++ b/core/fpdfapi/render/cpdf_dibsource.cpp @@ -686,7 +686,7 @@ int CPDF_DIBSource::StartLoadMask() { m_pMaskStream = m_pDict->GetStreamFor("SMask"); if (m_pMaskStream) { CPDF_Array* pMatte = m_pMaskStream->GetDict()->GetArrayFor("Matte"); - if (pMatte && m_pColorSpace && + if (pMatte && m_pColorSpace && m_Family != PDFCS_PATTERN && m_pColorSpace->CountComponents() <= m_nComponents) { float R, G, B; std::vector<float> colors(m_nComponents); @@ -752,6 +752,9 @@ void CPDF_DIBSource::LoadPalette() { if (!m_pColorSpace) { return; } + if (m_Family == PDFCS_PATTERN) + return; + if (m_bpc * m_nComponents == 1) { if (m_bDefaultDecode && (m_Family == PDFCS_DEVICEGRAY || m_Family == PDFCS_DEVICERGB)) { @@ -922,7 +925,7 @@ void CPDF_DIBSource::TranslateScanline24bpp(uint8_t* dest_scan, R = (1.0f - color_values[0]) * k; G = (1.0f - color_values[1]) * k; B = (1.0f - color_values[2]) * k; - } else { + } else if (m_Family != PDFCS_PATTERN) { m_pColorSpace->GetRGB(color_values, &R, &G, &B); } R = ClampValue(R, 1.0f); @@ -948,7 +951,7 @@ void CPDF_DIBSource::TranslateScanline24bpp(uint8_t* dest_scan, R = (1.0f - color_values[0]) * k; G = (1.0f - color_values[1]) * k; B = (1.0f - color_values[2]) * k; - } else { + } else if (m_Family != PDFCS_PATTERN) { m_pColorSpace->GetRGB(color_values, &R, &G, &B); } R = ClampValue(R, 1.0f); |