Fix a leak in CPDF_Type3Font::LoadChar().

core/include/fpdfapi/fpdf_resource.h

 // 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
 
 #ifndef CORE_INCLUDE_FPDFAPI_FPDF_RESOURCE_H_
 #define CORE_INCLUDE_FPDFAPI_FPDF_RESOURCE_H_
 
+#include <map>
+
 #include "../fxcrt/fx_system.h"
 #include "../fxge/fx_font.h"
 #include "fpdf_parser.h"
 
 class CFX_CTTGSUBTable;
 class CFX_DIBitmap;
 class CFX_Font;
 class CFX_SubstFont;
 class CPDF_CID2UnicodeMap;
 class CPDF_CIDFont;
@@ skipping 333 matching lines @@
   virtual void LoadGlyphMap();
 };
 class CPDF_TrueTypeFont : public CPDF_SimpleFont {
  public:
   CPDF_TrueTypeFont();
 
  protected:
   virtual FX_BOOL _Load();
   virtual void LoadGlyphMap();
 };
+
 class CPDF_Type3Char {
  public:
-  CPDF_Type3Char();
-
+  // Takes ownership of |pForm|.
+  explicit CPDF_Type3Char(CPDF_Form* pForm);
   ~CPDF_Type3Char();
 
   FX_BOOL LoadBitmap(CPDF_RenderContext* pContext);
 
+  CPDF_Form* m_pForm;
+  CFX_DIBitmap* m_pBitmap;
   FX_BOOL m_bColored;
-
-  FX_BOOL m_bPageRequired;
-
-  CPDF_Form* m_pForm;
-
+  int m_Width;
   CFX_AffineMatrix m_ImageMatrix;
-
-  CFX_DIBitmap* m_pBitmap;
-
-  int m_Width;
-
   FX_RECT m_BBox;
 };
+
 class CPDF_Type3Font : public CPDF_SimpleFont {
  public:
   CPDF_Type3Font();
   ~CPDF_Type3Font() override;
 
   void SetPageResources(CPDF_Dictionary* pResources) {
     m_pPageResources = pResources;
   }
   CPDF_Type3Char* LoadChar(FX_DWORD charcode, int level = 0);
   int GetCharWidthF(FX_DWORD charcode, int level = 0) override;
   int GetCharTypeWidth(FX_DWORD charcode) override {
     return GetCharWidthF(charcode);
   }
   void GetCharBBox(FX_DWORD charcode, FX_RECT& rect, int level = 0) override;
   CFX_AffineMatrix& GetFontMatrix() { return m_FontMatrix; }
   void CheckType3FontMetrics();
 
  protected:
   CFX_AffineMatrix m_FontMatrix;
 
  private:
   FX_BOOL _Load() override;
   void LoadGlyphMap() override {}
 
   int m_CharWidthL[256];
   CPDF_Dictionary* m_pCharProcs;
   CPDF_Dictionary* m_pPageResources;
   CPDF_Dictionary* m_pFontResources;
-  CFX_MapPtrToPtr m_CacheMap;
-  CFX_MapPtrToPtr m_DeletedMap;
+  std::map<FX_DWORD, CPDF_Type3Char*> m_CacheMap;
 };
 
 enum CIDSet {
   CIDSET_UNKNOWN,
   CIDSET_GB1,
   CIDSET_CNS1,
   CIDSET_JAPAN1,
   CIDSET_KOREA1,
   CIDSET_UNICODE,
   CIDSET_NUM_SETS
@@ skipping 429 matching lines @@
 
   FX_BOOL m_bInterpolate;
 
   CPDF_Document* m_pDocument;
 
   CPDF_Dictionary* m_pOC;
   CPDF_Dictionary* InitJPEG(uint8_t* pData, FX_DWORD size);
 };
 
 #endif  // CORE_INCLUDE_FPDFAPI_FPDF_RESOURCE_H_