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

core/include/fpdftext/fpdf_text.h

 // 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
 
 #ifndef CORE_INCLUDE_FPDFTEXT_FPDF_TEXT_H_
 #define CORE_INCLUDE_FPDFTEXT_FPDF_TEXT_H_
 
 #include "core/include/fpdfapi/fpdf_parser.h"
@@ skipping 24 matching lines @@
 void PDF_GetTextStream_Unicode(CFX_WideTextBuf& buffer,
                                CPDF_Document* pDoc,
                                CPDF_Dictionary* pPage,
                                FX_DWORD flags);
 CFX_WideString PDF_GetFirstTextLine_Unicode(CPDF_Document* pDoc,
                                             CPDF_Dictionary* pPage);
 #define CHAR_ERROR -1
 #define CHAR_NORMAL 0
 #define CHAR_GENERATED 1
 #define CHAR_UNUNICODE 2
-typedef struct {
+
+struct FPDF_CHAR_INFO {
   FX_WCHAR m_Unicode;
   FX_WCHAR m_Charcode;
   int32_t m_Flag;
   FX_FLOAT m_FontSize;
   FX_FLOAT m_OriginX;
   FX_FLOAT m_OriginY;
   CFX_FloatRect m_CharBox;
   CPDF_TextObject* m_pTextObj;
   CFX_Matrix m_Matrix;
-} FPDF_CHAR_INFO;
+};
+
 typedef CFX_ArrayTemplate<CFX_FloatRect> CFX_RectArray;
 #define FPDFTEXT_LRTB 0
 #define FPDFTEXT_RLTB 1
 #define FPDFTEXT_TBRL 2
 #define FPDFTEXT_LEFT -1
 #define FPDFTEXT_RIGHT 1
 #define FPDFTEXT_UP -2
 #define FPDFTEXT_DOWN 2
 #define FPDFTEXT_WRITINGMODE_UNKNOW 0
 #define FPDFTEXT_WRITINGMODE_LRTB 1
@@ skipping 19 matching lines @@
   virtual FX_BOOL ParseTextPage() = 0;
 
   virtual bool IsParsed() const = 0;
 
   virtual int CharIndexFromTextIndex(int TextIndex) const = 0;
 
   virtual int TextIndexFromCharIndex(int CharIndex) const = 0;
 
   virtual int CountChars() const = 0;
 
-  virtual void GetCharInfo(int index, FPDF_CHAR_INFO& info) const = 0;
+  virtual void GetCharInfo(int index, FPDF_CHAR_INFO* info) const = 0;
 
   virtual void GetRectArray(int start,
                             int nCount,
                             CFX_RectArray& rectArray) const = 0;
 
   virtual int GetIndexAtPos(CPDF_Point point,
                             FX_FLOAT xTolerance,
                             FX_FLOAT yTolerance) const = 0;
 
   virtual int GetIndexAtPos(FX_FLOAT x,
@@ skipping 67 matching lines @@
   virtual int CountLinks() const = 0;
 
   virtual CFX_WideString GetURL(int index) const = 0;
 
   virtual void GetBoundedSegment(int index, int& start, int& count) const = 0;
 
   virtual void GetRects(int index, CFX_RectArray& rects) const = 0;
 };
 
 #endif  // CORE_INCLUDE_FPDFTEXT_FPDF_TEXT_H_