From 2f2c1183e68ef4e9d5484bfeec00e19019454c84 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 7 May 2015 13:05:44 -0700 Subject: Merge to XFA: Make CFX_StockFontArray more robust. - Check bounds when accessing array. - Remove potential memory leak. - Merge duplicate code. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1094763002 (cherry picked from commit ee2fe42f9bf3ac6afc4f05f79629a3e34179a2b9) Review URL: https://codereview.chromium.org/1128803003 --- core/src/fpdfapi/fpdf_font/font_int.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'core/src/fpdfapi/fpdf_font/font_int.h') diff --git a/core/src/fpdfapi/fpdf_font/font_int.h b/core/src/fpdfapi/fpdf_font/font_int.h index a2d544afe9..56454286df 100644 --- a/core/src/fpdfapi/fpdf_font/font_int.h +++ b/core/src/fpdfapi/fpdf_font/font_int.h @@ -31,7 +31,6 @@ public: void Clear(void* key); CPDF_Font* Find(void* key, int index); void Set(void* key, int index, CPDF_Font* pFont); - CFX_MapPtrToPtr m_pStockMap; CPDF_CMapManager m_CMapManager; struct { const struct FXCMAP_CMap* m_pMapList; @@ -41,6 +40,8 @@ public: const FX_WORD* m_pMap; int m_Count; } m_EmbeddedToUnicodes[NUMBER_OF_CIDSETS]; +private: + CFX_MapPtrToPtr m_pStockMap; FX_LPBYTE m_pContrastRamps; }; struct _CMap_CodeRange { -- cgit v1.2.3