Fix memory leakage on Linux - part2

core/src/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/include/fxge/fx_freetype.h"
 #include "core/include/fxge/fx_ge.h"
 #include "text_int.h"
 
@@ skipping 88 matching lines @@
   m_pDwFont = pFont->m_pDwFont;
   m_hHandle = pFont->m_hHandle;
   m_bDwLoaded = pFont->m_bDwLoaded;
   m_pOwnedStream = pFont->m_pOwnedStream;
   return TRUE;
 }
 #endif  // PDF_ENABLE_XFA
 
 CFX_Font::~CFX_Font() {
   delete m_pSubstFont;
-  m_pSubstFont = NULL;
-#ifndef PDF_ENABLE_XFA
   FX_Free(m_pFontDataAllocation);
-  m_pFontDataAllocation = NULL;
-#else
+#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);
-  m_pOwnedStream = NULL;
 #endif  // PDF_ENABLE_XFA
   FX_Free(m_pGsubData);
-  m_pGsubData = NULL;
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
   ReleasePlatformResource();
 #endif
 }
 void CFX_Font::DeleteFace() {
   FXFT_Done_Face(m_Face);
   m_Face = NULL;
 }
 void CFX_Font::LoadSubst(const CFX_ByteString& face_name,
                          FX_BOOL bTrueType,
@@ skipping 404 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 NULL;
 }
 #endif  // PDF_ENABLE_XFA