Use smart pointers for CFX_Font and CFX_Type3Font classes

core/fxge/ge/fx_ge_font.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 "core/fxge/include/fx_font.h"
 
 #include "core/fpdfapi/fpdf_font/include/cpdf_font.h"
 #include "core/fxge/ge/fx_text_int.h"
@@ skipping 14 matching lines @@
     FXFM_ENCODING_ADOBE_LATIN_1, FXFM_ENCODING_OLD_LATIN_2,
     FXFM_ENCODING_APPLE_ROMAN,
 };
 
 CFX_UnicodeEncodingEx* _FXFM_CreateFontEncoding(CFX_Font* pFont,
                                                 uint32_t nEncodingID) {
   if (FXFT_Select_Charmap(pFont->GetFace(), nEncodingID))
     return nullptr;
   return new CFX_UnicodeEncodingEx(pFont, nEncodingID);
 }
+
+unsigned long FTStreamRead(FXFT_Stream stream,
+                           unsigned long offset,
+                           unsigned char* buffer,
+                           unsigned long count) {
+  if (count == 0) {

[dsinclair, 2016/07/21 19:39:59]

nit: no {}'s

[Wei Li, 2016/07/21 21:15:02]

Done.

+    return 0;
+  }
+  IFX_FileRead* pFile = (IFX_FileRead*)stream->descriptor.pointer;

[dsinclair, 2016/07/21 19:39:59]

nit: static_cast

[Wei Li, 2016/07/21 21:15:02]

Done.

+  int res = pFile->ReadBlock(buffer, offset, count);
+  if (res) {

[dsinclair, 2016/07/21 19:39:59]

ditto

[Wei Li, 2016/07/21 21:15:02]

Removed this.

+    return count;
+  }
+  return 0;

[dsinclair, 2016/07/21 19:39:59]

return res ? count : 0; ?

[Wei Li, 2016/07/21 21:15:03]

Done.

+}
+
+void FTStreamClose(FXFT_Stream stream) {}
+
+FX_BOOL LoadFileImp(FXFT_Library library,
+                    FXFT_Face* Face,
+                    IFX_FileRead* pFile,
+                    int32_t faceIndex,
+                    std::unique_ptr<FXFT_StreamRec>* stream) {
+  std::unique_ptr<FXFT_StreamRec> stream1(new FXFT_StreamRec());
+  stream1->base = nullptr;
+  stream1->size = (unsigned long)pFile->GetSize();

[dsinclair, 2016/07/21 19:39:59]

nit: static_cast

[Wei Li, 2016/07/21 21:15:02]

Done.

+  stream1->pos = 0;
+  stream1->descriptor.pointer = pFile;
+  stream1->close = FTStreamClose;
+  stream1->read = FTStreamRead;
+  FXFT_Open_Args args;
+  args.flags = FT_OPEN_STREAM;
+  args.stream = stream1.get();
+  if (FXFT_Open_Face(library, &args, faceIndex, Face))
+    return FALSE;
+  if (stream)
+    *stream = std::move(stream1);
+  return TRUE;
+}
 #endif  // PDF_ENABLE_XFA
 
 FXFT_Face FT_LoadFont(const uint8_t* pData, int size) {
   return CFX_GEModule::Get()->GetFontMgr()->GetFixedFace(pData, size, 0);
 }
 
 }  // namespace
 
 CFX_Font::CFX_Font()
 #ifdef PDF_ENABLE_XFA
     : m_bLogic(FALSE),
       m_pOwnedStream(nullptr),
       m_Face(nullptr),
 #else
     : m_Face(nullptr),
 #endif  // PDF_ENABLE_XFA
-      m_pSubstFont(nullptr),
-      m_pFontDataAllocation(nullptr),
       m_pFontData(nullptr),
       m_pGsubData(nullptr),
       m_dwSize(0),
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
       m_pPlatformFont(nullptr),
 #endif
       m_bEmbedded(FALSE),
       m_bVertical(FALSE) {
 }
 
 #ifdef PDF_ENABLE_XFA
 FX_BOOL CFX_Font::LoadClone(const CFX_Font* pFont) {
   if (!pFont)
     return FALSE;
 
   m_bLogic = TRUE;
   if (pFont->m_pSubstFont) {
-    m_pSubstFont = new CFX_SubstFont;
+    m_pSubstFont.reset(new CFX_SubstFont);
     m_pSubstFont->m_Charset = pFont->m_pSubstFont->m_Charset;
     m_pSubstFont->m_ExtHandle = pFont->m_pSubstFont->m_ExtHandle;
     m_pSubstFont->m_SubstFlags = pFont->m_pSubstFont->m_SubstFlags;
     m_pSubstFont->m_Weight = pFont->m_pSubstFont->m_Weight;
     m_pSubstFont->m_Family = pFont->m_pSubstFont->m_Family;
     m_pSubstFont->m_ItalicAngle = pFont->m_pSubstFont->m_ItalicAngle;
   }
   if (pFont->m_OtfFontData.GetSize()) {
     m_OtfFontData.AttachData(pFont->m_OtfFontData.GetBuffer(),
                              pFont->m_OtfFontData.GetSize());
   }
   m_Face = pFont->m_Face;
   m_bEmbedded = pFont->m_bEmbedded;
   m_bVertical = pFont->m_bVertical;
   m_dwSize = pFont->m_dwSize;
   m_pFontData = pFont->m_pFontData;
   m_pGsubData = pFont->m_pGsubData;
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
   m_pPlatformFont = pFont->m_pPlatformFont;
 #endif
   m_pOwnedStream = pFont->m_pOwnedStream;
   return TRUE;
 }
 #endif  // PDF_ENABLE_XFA
 
 CFX_Font::~CFX_Font() {
-  delete m_pSubstFont;
-  FX_Free(m_pFontDataAllocation);
 #ifdef PDF_ENABLE_XFA
   if (m_bLogic) {
     m_OtfFontData.DetachBuffer();
     return;
   }
 #endif  // PDF_ENABLE_XFA
   if (m_Face) {
 #ifndef PDF_ENABLE_XFA
     if (FXFT_Get_Face_External_Stream(m_Face)) {
       FXFT_Clear_Face_External_Stream(m_Face);
     }
 #endif  // PDF_ENABLE_XFA
     if (m_bEmbedded) {
       DeleteFace();
     } else {
       CFX_GEModule::Get()->GetFontMgr()->ReleaseFace(m_Face);
     }
   }
 #ifdef PDF_ENABLE_XFA
   FX_Free(m_pOwnedStream);
 #endif  // PDF_ENABLE_XFA
   FX_Free(m_pGsubData);
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
   ReleasePlatformResource();
 #endif
 }
+
 void CFX_Font::DeleteFace() {
   FXFT_Done_Face(m_Face);
   m_Face = nullptr;
 }
+
 void CFX_Font::LoadSubst(const CFX_ByteString& face_name,
                          FX_BOOL bTrueType,
                          uint32_t flags,
                          int weight,
                          int italic_angle,
                          int CharsetCP,
                          FX_BOOL bVertical) {
   m_bEmbedded = FALSE;
   m_bVertical = bVertical;
-  m_pSubstFont = new CFX_SubstFont;
+  m_pSubstFont.reset(new CFX_SubstFont);
   m_Face = CFX_GEModule::Get()->GetFontMgr()->FindSubstFont(
       face_name, bTrueType, flags, weight, italic_angle, CharsetCP,
-      m_pSubstFont);
+      m_pSubstFont.get());
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
   if (m_pSubstFont->m_ExtHandle) {
     m_pPlatformFont = m_pSubstFont->m_ExtHandle;
     m_pSubstFont->m_ExtHandle = nullptr;
   }
 #endif
   if (m_Face) {
     m_pFontData = FXFT_Get_Face_Stream_Base(m_Face);
     m_dwSize = FXFT_Get_Face_Stream_Size(m_Face);
   }
 }
+
 #ifdef PDF_ENABLE_XFA
-extern "C" {
-unsigned long _FTStreamRead(FXFT_Stream stream,
-                            unsigned long offset,
-                            unsigned char* buffer,
-                            unsigned long count) {
-  if (count == 0) {
-    return 0;
-  }
-  IFX_FileRead* pFile = (IFX_FileRead*)stream->descriptor.pointer;
-  int res = pFile->ReadBlock(buffer, offset, count);
-  if (res) {
-    return count;
-  }
-  return 0;
-}
-void _FTStreamClose(FXFT_Stream stream) {}
-};
-FX_BOOL _LoadFile(FXFT_Library library,
-                  FXFT_Face* Face,
-                  IFX_FileRead* pFile,
-                  FXFT_Stream* stream,
-                  int32_t faceIndex = 0) {
-  FXFT_Stream stream1 = (FXFT_Stream)FX_Alloc(uint8_t, sizeof(FXFT_StreamRec));
-  stream1->base = nullptr;
-  stream1->size = (unsigned long)pFile->GetSize();
-  stream1->pos = 0;
-  stream1->descriptor.pointer = pFile;
-  stream1->close = _FTStreamClose;
-  stream1->read = _FTStreamRead;
-  FXFT_Open_Args args;
-  args.flags = FT_OPEN_STREAM;
-  args.stream = stream1;
-  if (FXFT_Open_Face(library, &args, faceIndex, Face)) {
-    FX_Free(stream1);
-    return FALSE;
-  }
-  if (stream) {
-    *stream = stream1;
-  }
-  return TRUE;
-}
-
 FX_BOOL CFX_Font::LoadFile(IFX_FileRead* pFile,
                            int nFaceIndex,
                            int* pFaceCount) {
   m_bEmbedded = FALSE;
 
   CFX_FontMgr* pFontMgr = CFX_GEModule::Get()->GetFontMgr();
   pFontMgr->InitFTLibrary();
   FXFT_Library library = pFontMgr->GetFTLibrary();
 
-  FXFT_Stream stream = nullptr;
-  if (!_LoadFile(library, &m_Face, pFile, &stream, nFaceIndex))
+  std::unique_ptr<FXFT_StreamRec> stream;
+  if (!LoadFileImp(library, &m_Face, pFile, nFaceIndex, &stream))
     return FALSE;
 
   if (pFaceCount)
     *pFaceCount = (int)m_Face->num_faces;
-  m_pOwnedStream = stream;
+  m_pOwnedStream = stream.release();
   FXFT_Set_Pixel_Sizes(m_Face, 0, 64);
   return TRUE;
 }
 #endif  // PDF_ENABLE_XFA
 
 int CFX_Font::GetGlyphWidth(uint32_t glyph_index) {
   if (!m_Face) {
     return 0;
   }
   if (m_pSubstFont && (m_pSubstFont->m_SubstFlags & FXFONT_SUBST_MM)) {
     AdjustMMParams(glyph_index, 0, 0);
   }
   int err = FXFT_Load_Glyph(
       m_Face, glyph_index,
       FXFT_LOAD_NO_SCALE | FXFT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH);
   if (err) {
     return 0;
   }
   int width = EM_ADJUST(FXFT_Get_Face_UnitsPerEM(m_Face),
                         FXFT_Get_Glyph_HoriAdvance(m_Face));
   return width;
 }
 
 FX_BOOL CFX_Font::LoadEmbedded(const uint8_t* data, uint32_t size) {
-  m_pFontDataAllocation = FX_Alloc(uint8_t, size);
-  FXSYS_memcpy(m_pFontDataAllocation, data, size);
-  m_Face = FT_LoadFont(m_pFontDataAllocation, size);
-  m_pFontData = m_pFontDataAllocation;
+  std::vector<uint8_t> temp(data, data + size / sizeof(uint8_t));

[dsinclair, 2016/07/21 19:39:59]

Why does this divide by uint8_t? Size is the number of elements in data, so
won't last just be data + size?

[Wei Li, 2016/07/21 21:15:02]

Right, thanks

+  m_pFontDataAllocation.swap(temp);
+  m_Face = FT_LoadFont(m_pFontDataAllocation.data(), size);
+  m_pFontData = m_pFontDataAllocation.data();
   m_bEmbedded = TRUE;
   m_dwSize = size;
   return !!m_Face;
 }
 
 FX_BOOL CFX_Font::IsTTFont() const {
   if (!m_Face)
     return FALSE;
   return FXFT_Is_Face_TT_OT(m_Face) == FXFT_FACE_FLAG_SFNT;
 }
@@ skipping 281 matching lines @@
   for (size_t i = 0; i < FX_ArraySize(g_EncodingID); ++i) {
     CFX_UnicodeEncodingEx* pFontEncoding =
         _FXFM_CreateFontEncoding(pFont, g_EncodingID[i]);
     if (pFontEncoding) {
       return pFontEncoding;
     }
   }
   return nullptr;
 }
 #endif  // PDF_ENABLE_XFA