Merge to XFA: Fix an uninitalized read in FPDFText_GetFontSize().

fpdfsdk/src/fpdftext.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "public/fpdf_text.h"
 
 #include "core/include/fpdfdoc/fpdf_doc.h"
 #include "core/include/fpdftext/fpdf_text.h"
@@ skipping 26 matching lines @@
 }
 DLLEXPORT void STDCALL FPDFText_ClosePage(FPDF_TEXTPAGE text_page) {
   delete (IPDF_TextPage*)text_page;
 }
 DLLEXPORT int STDCALL FPDFText_CountChars(FPDF_TEXTPAGE text_page) {
   if (!text_page)
     return -1;
   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)
     return -1;
   IPDF_TextPage* textpage = (IPDF_TextPage*)text_page;
 
   if (index < 0 || index >= textpage->CountChars())
     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)
     return 0;
   IPDF_TextPage* textpage = (IPDF_TextPage*)text_page;
 
   if (index < 0 || index >= textpage->CountChars())
     return 0;
 
   FPDF_CHAR_INFO charinfo;
-  textpage->GetCharInfo(index, charinfo);
+  textpage->GetCharInfo(index, &charinfo);
   return charinfo.m_FontSize;
 }
 
 DLLEXPORT void STDCALL FPDFText_GetCharBox(FPDF_TEXTPAGE text_page,
                                            int index,
                                            double* left,
                                            double* right,
                                            double* bottom,
                                            double* top) {
   if (!text_page)
     return;
   IPDF_TextPage* textpage = (IPDF_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;
   *top = charinfo.m_CharBox.top;
 }
 
 // select
 DLLEXPORT int STDCALL FPDFText_GetCharIndexAtPos(FPDF_TEXTPAGE text_page,
                                                  double x,
                                                  double y,
@@ skipping 190 matching lines @@
     CFX_FloatRect rect = rectArray.GetAt(rect_index);
     *left = rect.left;
     *right = rect.right;
     *top = rect.top;
     *bottom = rect.bottom;
   }
 }
 DLLEXPORT void STDCALL FPDFLink_CloseWebLinks(FPDF_PAGELINK link_page) {
   delete (IPDF_LinkExtract*)link_page;
 }