diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-05-18 14:29:22 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-05-18 14:29:22 -0700 |
| commit | 038cd084817aca8017255a6b3782fcba2688d2cb (patch) | |
| tree | 2f6a4e2c6969139dedc64961102b0dc8d0b8661d /core/src/fpdftext | |
| parent | ed099befbb300d6f9c393cb415fdb2a68c2ef471 (diff) | |
| download | pdfium-038cd084817aca8017255a6b3782fcba2688d2cb.tar.xz | |
Merge to XFA: Add safe FX_Alloc2D() macro
Original Review URL: https://codereview.chromium.org/1143663004
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1136673005
Diffstat (limited to 'core/src/fpdftext')
| -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 e1902a3764..ddb0b324ce 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(' '); |