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_text.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_text.cpp')
| -rw-r--r-- | core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp index 449b003c56..f99f7cec38 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp @@ -423,7 +423,7 @@ FX_BOOL CPDF_RenderStatus::ProcessType3Text(const CPDF_TextObject* textobj, cons } if (fill_alpha == 255) { CPDF_RenderStatus status; - status.Initialize(m_Level + 1, m_pContext, m_pDevice, NULL, NULL, this, pStates, &Options, + status.Initialize(m_pContext, m_pDevice, NULL, NULL, this, pStates, &Options, pType3Char->m_pForm->m_Transparency, m_bDropObjects, pFormResource, FALSE, pType3Char, fill_argb); status.m_Type3FontCache.Append(m_Type3FontCache); status.m_Type3FontCache.Add(pType3Font); @@ -440,7 +440,7 @@ FX_BOOL CPDF_RenderStatus::ProcessType3Text(const CPDF_TextObject* textobj, cons } bitmap_device.GetBitmap()->Clear(0); CPDF_RenderStatus status; - status.Initialize(m_Level + 1, m_pContext, &bitmap_device, NULL, NULL, this, pStates, &Options, + status.Initialize(m_pContext, &bitmap_device, NULL, NULL, this, pStates, &Options, pType3Char->m_pForm->m_Transparency, m_bDropObjects, pFormResource, FALSE, pType3Char, fill_argb); status.m_Type3FontCache.Append(m_Type3FontCache); status.m_Type3FontCache.Add(pType3Font); |