Fix heap-use-after-free in CXFA_PDFFontMgr::~CXFA_PDFFontMgr()

BUG=pdfium:306
R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1506423002 .

1 files changed, 1 insertions, 8 deletions

diff --git a/xfa/src/fxfa/src/app/xfa_fontmgr.cpp b/xfa/src/fxfa/src/app/xfa_fontmgr.cpp
index 23a1b29c01..f63c4f2810 100644
--- a/xfa/src/fxfa/src/app/xfa_fontmgr.cpp
+++ b/xfa/src/fxfa/src/app/xfa_fontmgr.cpp
@@ -1864,15 +1864,8 @@ CXFA_PDFFontMgr::CXFA_PDFFontMgr(CXFA_FFDoc* pDoc) {
   m_pDoc = pDoc;

 }

 CXFA_PDFFontMgr::~CXFA_PDFFontMgr() {

-  FX_POSITION ps = m_FDE2PDFFont.GetStartPosition();

-  while (ps) {

-    IFX_Font* pFDEFont;

-    void* pPDFFont;

-    m_FDE2PDFFont.GetNextAssoc(ps, (void*&)pFDEFont, pPDFFont);

-    pFDEFont->SetFontProvider(NULL);

-  }

   m_FDE2PDFFont.RemoveAll();

-  ps = m_FontArray.GetStartPosition();

+  FX_POSITION ps = m_FontArray.GetStartPosition();

   while (ps) {

     CFX_ByteString strKey;

     IFX_Font* pFont = NULL;