Land on Master: Fix two new / free mismatches

core/src/fpdfapi/fpdf_font/fpdf_font.cpp

Index: core/src/fpdfapi/fpdf_font/fpdf_font.cpp
diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp
index 91d4010b803e1e06a6594ba8cf85354b1fa36aa5..9ee9621849bed59773945d57397bc34a4d19fb51 100644
--- a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp
+++ b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp
@@ -128,14 +128,12 @@ FX_BOOL CPDF_Font::Initialize()
 }
 CPDF_Font::~CPDF_Font()
 {
-    if (m_pCharMap) {
-        FX_Free(m_pCharMap);
-        m_pCharMap = NULL;
-    }
-    if (m_pToUnicodeMap) {
-        delete m_pToUnicodeMap;
-        m_pToUnicodeMap = NULL;
-    }
+    delete m_pCharMap;
+    m_pCharMap = NULL;
+
+    delete m_pToUnicodeMap;
+    m_pToUnicodeMap = NULL;
+
     if (m_pFontFile) {
         m_pDocument->GetPageData()->ReleaseFontFileStreamAcc((CPDF_Stream*)m_pFontFile->GetStream());
     }