diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-05-18 14:18:08 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-05-18 14:18:08 -0700 |
| commit | 31b3a2b31a50f83ed100e01485013fd871399f45 (patch) | |
| tree | aeece5130880a698b56eec044d73925e7e5ae7f3 /core/src/fpdftext/fpdf_text.cpp | |
| parent | a88e3a16ae711f6523ad3a40a08d774b72adc9eb (diff) | |
| download | pdfium-31b3a2b31a50f83ed100e01485013fd871399f45.tar.xz | |
Add safe FX_Alloc2D() macro
This avoids unchecked multiplications when computing a size argument
to malloc(). Such an overflow is very scary, and can result in
exploitable bugs.
Along the way, kill off some return checks, since we know this can't
return NULL.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1143663004
Diffstat (limited to 'core/src/fpdftext/fpdf_text.cpp')
| -rw-r--r-- | core/src/fpdftext/fpdf_text.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/src/fpdftext/fpdf_text.cpp b/core/src/fpdftext/fpdf_text.cpp index 6c1e22563d..a0b01042e1 100644 --- a/core/src/fpdftext/fpdf_text.cpp +++ b/core/src/fpdftext/fpdf_text.cpp @@ -57,10 +57,9 @@ void CTextPage::ProcessObject(CPDF_PageObject* pObject) CPDF_TextObject* pText = (CPDF_TextObject*)pObject; CPDF_Font* pFont = pText->m_TextState.GetFont(); int count = pText->CountItems(); - FX_FLOAT* pPosArray = FX_Alloc(FX_FLOAT, count * 2); - if (pPosArray) { - pText->CalcCharPos(pPosArray); - } + FX_FLOAT* pPosArray = FX_Alloc2D(FX_FLOAT, count, 2); + pText->CalcCharPos(pPosArray); + FX_FLOAT fontsize_h = pText->m_TextState.GetFontSizeH(); FX_FLOAT fontsize_v = pText->m_TextState.GetFontSizeV(); FX_DWORD space_charcode = pFont->CharCodeFromUnicode(' '); |