Use unique_ptr in CPDF_CidFont

core/fpdfapi/fpdf_font/cpdf_cidfont.h

Index: core/fpdfapi/fpdf_font/cpdf_cidfont.h
diff --git a/core/fpdfapi/fpdf_font/cpdf_cidfont.h b/core/fpdfapi/fpdf_font/cpdf_cidfont.h
index 9beb7cb1079b7c5cb4ec5578aa56964667ca3b52..97bcdd1c9c168c8e868fa5bf3fc0abb83c435e56 100644
--- a/core/fpdfapi/fpdf_font/cpdf_cidfont.h
+++ b/core/fpdfapi/fpdf_font/cpdf_cidfont.h
@@ -69,21 +69,21 @@ class CPDF_CIDFont : public CPDF_Font {
   FX_WCHAR GetUnicodeFromCharCode(uint32_t charcode) const;
 
   CPDF_CMap* m_pCMap;
-  CPDF_CMap* m_pAllocatedCMap;
+  std::unique_ptr<CPDF_CMap> m_pAllocatedCMap;

[Lei Zhang, 2016/05/20 23:41:28]

#include <memory>

[Tom Sepez, 2016/05/23 18:09:44]

Done.

   CPDF_CID2UnicodeMap* m_pCID2UnicodeMap;
   CIDSet m_Charset;
   FX_BOOL m_bType1;
-  CPDF_StreamAcc* m_pCIDToGIDMap;
   FX_BOOL m_bCIDIsGID;
   uint16_t m_DefaultWidth;
-  uint16_t* m_pAnsiWidths;
+  std::unique_ptr<CPDF_StreamAcc> m_pCIDToGIDMap;

[Lei Zhang, 2016/05/20 23:41:28]

This is a strangely named variable.

[Tom Sepez, 2016/05/23 18:09:43]

Yeah, really bugged me.  Renamed.

+  std::unique_ptr<uint16_t, FxFreeDeleter> m_pAnsiWidths;

[Lei Zhang, 2016/05/20 23:41:28]

std::vector instead?

[Tom Sepez, 2016/05/23 18:09:44]

Done.

   FX_SMALL_RECT m_CharBBox[256];
   CFX_ArrayTemplate<uint32_t> m_WidthList;
   short m_DefaultVY;
   short m_DefaultW1;
   CFX_ArrayTemplate<uint32_t> m_VertMetrics;
   FX_BOOL m_bAdobeCourierStd;
-  CFX_CTTGSUBTable* m_pTTGSUBTable;
+  std::unique_ptr<CFX_CTTGSUBTable> m_pTTGSUBTable;
 };
 
 #endif  // CORE_FPDFAPI_FPDF_FONT_CPDF_CIDFONT_H_