XFA: Take CTTFontDesc::ReleaseFace() changes from master.

core/src/fxge/ge/fx_ge_fontmap.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 <limits>
 
 #include "../../../include/fxge/fx_ge.h"
 #include "../../../include/fxge/fx_freetype.h"
@@ skipping 40 matching lines @@
       FXFT_Done_Face(m_SingleFace.m_pFace);
     }
   } else if (m_Type == 2) {
     for (int i = 0; i < 16; i++)
       if (m_TTCFace.m_pFaces[i]) {
         FXFT_Done_Face(m_TTCFace.m_pFaces[i]);
       }
   }
   FX_Free(m_pFontData);
 }
-int32_t CTTFontDesc::ReleaseFace(FXFT_Face face) {
+FX_BOOL CTTFontDesc::ReleaseFace(FXFT_Face face) {
   if (m_Type == 1) {
     if (m_SingleFace.m_pFace != face) {
-      return -1;
+      return FALSE;
     }
   } else if (m_Type == 2) {
     int i;
     for (i = 0; i < 16; i++)
       if (m_TTCFace.m_pFaces[i] == face) {
         break;
       }
     if (i == 16) {
-      return -1;
+      return FALSE;
     }
   }
   m_RefCount--;
   if (m_RefCount) {
-    return m_RefCount;
+    return FALSE;
   }
   delete this;
-  return 0;
+  return TRUE;
 }
 
 CFX_FontMgr::CFX_FontMgr() : m_FTLibrary(nullptr) {
   m_pBuiltinMapper.reset(new CFX_FontMapper(this));
 }
 
 CFX_FontMgr::~CFX_FontMgr() {
   for (const auto& pair : m_FaceMap)
     delete pair.second;
 
@@ skipping 258 matching lines @@
   FXFT_Face face = nullptr;
   if (FXFT_New_Face(library, filename, face_index, &face))
     return nullptr;
   return FXFT_Set_Pixel_Sizes(face, 64, 64) ? nullptr : face;
 }
 
 void CFX_FontMgr::ReleaseFace(FXFT_Face face) {
   if (!face) {
     return;
   }
-  FX_BOOL bNeedFaceDone = TRUE;
   auto it = m_FaceMap.begin();
   while (it != m_FaceMap.end()) {
     auto temp = it++;
-    int nRet = temp->second->ReleaseFace(face);
-    if (nRet == 0) {
+    if (temp->second->ReleaseFace(face)) {
       m_FaceMap.erase(temp);
-      bNeedFaceDone = FALSE;
-    } else if (nRet > 0) {
-      bNeedFaceDone = FALSE;
     }
   }
-  if (bNeedFaceDone && !m_pBuiltinMapper->IsBuiltinFace(face)) {

[Lei Zhang, 2015/10/30 06:35:47]

CFX_FontMapper::IsBuiltinFace() is dead after this.

-    FXFT_Done_Face(face);

[Lei Zhang, 2015/10/30 06:35:47]

Better to leak than double free.

-  }
 }
 const FoxitFonts g_FoxitFonts[14] = {
     {g_FoxitFixedFontData, 17597},
     {g_FoxitFixedBoldFontData, 18055},
     {g_FoxitFixedBoldItalicFontData, 19151},
     {g_FoxitFixedItalicFontData, 18746},
     {g_FoxitSansFontData, 15025},
     {g_FoxitSansBoldFontData, 16344},
     {g_FoxitSansBoldItalicFontData, 16418},
     {g_FoxitSansItalicFontData, 16339},
@@ skipping 29 matching lines @@
 CFX_FontMapper::CFX_FontMapper(CFX_FontMgr* mgr)
     : m_bListLoaded(FALSE),
       m_pFontInfo(nullptr),
       m_pFontEnumerator(nullptr),
       m_pFontMgr(mgr) {
   m_MMFaces[0] = nullptr;
   m_MMFaces[1] = nullptr;
   FXSYS_memset(m_FoxitFaces, 0, sizeof(m_FoxitFaces));
 }
 CFX_FontMapper::~CFX_FontMapper() {
-  for (int i = 0; i < 14; i++)
-    if (m_FoxitFaces[i]) {
+  for (size_t i = 0; i < FX_ArraySize(m_FoxitFaces); ++i) {
+    if (m_FoxitFaces[i])
       FXFT_Done_Face(m_FoxitFaces[i]);
-    }
+  }
   if (m_MMFaces[0]) {
     FXFT_Done_Face(m_MMFaces[0]);
   }
   if (m_MMFaces[1]) {
     FXFT_Done_Face(m_MMFaces[1]);
   }
   if (m_pFontInfo) {
     m_pFontInfo->Release();
   }
 }
@@ skipping 1195 matching lines @@
 int PDF_GetStandardFontName(CFX_ByteString* name) {
   AltFontName* found = static_cast<AltFontName*>(
       FXSYS_bsearch(name->c_str(), g_AltFontNames, FX_ArraySize(g_AltFontNames),
                     sizeof(AltFontName), compareString));
   if (!found)
     return -1;
 
   *name = g_Base14FontNames[found->m_Index];
   return found->m_Index;
 }