Properly ref count IFX_FileAccess.

xfa/fgas/font/cfgas_fontmgr.cpp

 // Copyright 2015 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 "xfa/fgas/font/cfgas_fontmgr.h"
 
 #include <memory>
 #include <utility>
@@ skipping 548 matching lines @@
   return bsName;
 }
 
 FX_POSITION CFX_FontSourceEnum_File::GetStartPosition() {
   m_wsNext = GetNextFile().UTF8Decode();
   if (m_wsNext.GetLength() == 0)
     return (FX_POSITION)0;
   return (FX_POSITION)-1;
 }
 
-IFX_FileAccess* CFX_FontSourceEnum_File::GetNext(FX_POSITION& pos) {
-  IFX_FileAccess* pAccess = IFX_FileAccess::CreateDefault(m_wsNext.AsStringC());
+CFX_RetainPtr<IFX_FileAccess> CFX_FontSourceEnum_File::GetNext(
+    FX_POSITION& pos) {

[dsinclair, 2016/12/07 23:05:03]

Can this be a * instead of an &?

[Tom Sepez, 2016/12/07 23:26:55]

It could, but this goes far beyond this  -- the FX iterator pattern uses
(FX_POSITION& pos) throughout the codebase. 

+  CFX_RetainPtr<IFX_FileAccess> pAccess =
+      IFX_FileAccess::CreateDefault(m_wsNext.AsStringC());
   m_wsNext = GetNextFile().UTF8Decode();
-  pos = m_wsNext.GetLength() != 0 ? pAccess : nullptr;
+  pos = m_wsNext.GetLength() != 0 ? pAccess.Get() : nullptr;
   return pAccess;
 }
 
 std::unique_ptr<CFGAS_FontMgr> CFGAS_FontMgr::Create(
     CFX_FontSourceEnum_File* pFontEnum) {
   if (!pFontEnum)
     return nullptr;
 
   auto pFontMgr = pdfium::MakeUnique<CFGAS_FontMgr>(pFontEnum);
   if (!pFontMgr->EnumFonts())
@@ skipping 46 matching lines @@
     CFX_WideString wsFaceName =
         CFX_WideString::FromLocal(pFontMapper->GetFaceName(i).c_str());
     RegisterFaces(pFontStream, &wsFaceName);
   }
   return m_InstalledFonts.GetSize() != 0;
 }
 
 bool CFGAS_FontMgr::EnumFontsFromFiles() {
   CFX_GEModule::Get()->GetFontMgr()->InitFTLibrary();
   FX_POSITION pos = m_pFontSource->GetStartPosition();
-  IFX_FileAccess* pFontSource = nullptr;
-  CFX_RetainPtr<IFX_SeekableReadStream> pFontStream;
   while (pos) {
-    pFontSource = m_pFontSource->GetNext(pos);
-    pFontStream = pFontSource->CreateFileStream(FX_FILEMODE_ReadOnly);
-    if (!pFontStream) {
-      pFontSource->Release();
-      continue;
-    }
-    RegisterFaces(pFontStream, nullptr);
-    pFontSource->Release();
+    CFX_RetainPtr<IFX_FileAccess> pFontSource = m_pFontSource->GetNext(pos);
+    CFX_RetainPtr<IFX_SeekableReadStream> pFontStream =
+        pFontSource->CreateFileStream(FX_FILEMODE_ReadOnly);
+    if (pFontStream)
+      RegisterFaces(pFontStream, nullptr);
   }
   return m_InstalledFonts.GetSize() != 0;
 }
 
 bool CFGAS_FontMgr::EnumFonts() {
   if (EnumFontsFromFontMapper())
     return true;
   return EnumFontsFromFiles();
 }
 
@@ skipping 528 matching lines @@
 }
 
 int32_t CFGAS_FontMgr::IsPartName(const CFX_WideString& Name1,
                                   const CFX_WideString& Name2) {
   if (Name1.Find(Name2.c_str()) != -1)
     return 1;
   return 0;
 }
 
 #endif  // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_