diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-01-29 18:16:16 -0800 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-01-29 18:16:16 -0800 |
commit | 09dc51a44ba2c084ca553d8a52ba6e2e669f4f9c (patch) | |
tree | a8deda72748cf24cc9f8782ddea1d1f28d187e42 /core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp | |
parent | daa2e84dfca2f1cf39e064bd9ad6ee3e2cd70825 (diff) | |
download | pdfium-09dc51a44ba2c084ca553d8a52ba6e2e669f4f9c.tar.xz |
Merge to XFA: Fix infinite recursion in CPDF_RenderStatus::RenderSingleObject().
This brings in:
14b2bb0 Fix infinite recursion in CPDF_RenderStatus::RenderSingleObject().
1d43e82 Add minimized test cases for stack exhaustion crash to repository.
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/893493002
Diffstat (limited to 'core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp')
-rw-r--r-- | core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp index 6b895b525b..8024c991f4 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp @@ -988,7 +988,7 @@ void CPDF_RenderStatus::DrawTilingPattern(CPDF_TilingPattern* pPattern, CPDF_Pag matrix.Translate(orig_x - mtPattern2Device.e, orig_y - mtPattern2Device.f); m_pDevice->SaveState(); CPDF_RenderStatus status; - status.Initialize(m_Level + 1, m_pContext, m_pDevice, NULL, NULL, this, pStates, &m_Options, + status.Initialize(m_pContext, m_pDevice, NULL, NULL, this, pStates, &m_Options, pPattern->m_pForm->m_Transparency, m_bDropObjects, pFormResource); status.RenderObjectList(pPattern->m_pForm, &matrix); m_pDevice->RestoreState(); |