From 0f2ea02eb3d817993f3a5be0a5fa48f602e56483 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Mon, 11 Jan 2016 12:01:23 -0800 Subject: Merge to XFA: Fix an uninitalized read in FPDFText_GetFontSize(). BUG=pdfium:346 TBR=jun_fang@foxitsoftware.com Review URL: https://codereview.chromium.org/1578543002 . (cherry picked from commit 401cd2dbaaa10790077de2fd70e8101b0bdd0f36) Review URL: https://codereview.chromium.org/1578873002 . --- fpdfsdk/src/fpdftext.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'fpdfsdk/src/fpdftext.cpp') diff --git a/fpdfsdk/src/fpdftext.cpp b/fpdfsdk/src/fpdftext.cpp index c5226244f2..c745c26868 100644 --- a/fpdfsdk/src/fpdftext.cpp +++ b/fpdfsdk/src/fpdftext.cpp @@ -44,6 +44,7 @@ DLLEXPORT int STDCALL FPDFText_CountChars(FPDF_TEXTPAGE text_page) { IPDF_TextPage* textpage = (IPDF_TextPage*)text_page; return textpage->CountChars(); } + DLLEXPORT unsigned int STDCALL FPDFText_GetUnicode(FPDF_TEXTPAGE text_page, int index) { if (!text_page) @@ -54,9 +55,10 @@ DLLEXPORT unsigned int STDCALL FPDFText_GetUnicode(FPDF_TEXTPAGE text_page, return 0; FPDF_CHAR_INFO charinfo; - textpage->GetCharInfo(index, charinfo); + textpage->GetCharInfo(index, &charinfo); return charinfo.m_Unicode; } + DLLEXPORT double STDCALL FPDFText_GetFontSize(FPDF_TEXTPAGE text_page, int index) { if (!text_page) @@ -67,7 +69,7 @@ DLLEXPORT double STDCALL FPDFText_GetFontSize(FPDF_TEXTPAGE text_page, return 0; FPDF_CHAR_INFO charinfo; - textpage->GetCharInfo(index, charinfo); + textpage->GetCharInfo(index, &charinfo); return charinfo.m_FontSize; } @@ -84,7 +86,7 @@ DLLEXPORT void STDCALL FPDFText_GetCharBox(FPDF_TEXTPAGE text_page, if (index < 0 || index >= textpage->CountChars()) return; FPDF_CHAR_INFO charinfo; - textpage->GetCharInfo(index, charinfo); + textpage->GetCharInfo(index, &charinfo); *left = charinfo.m_CharBox.left; *right = charinfo.m_CharBox.right; *bottom = charinfo.m_CharBox.bottom; -- cgit v1.2.3