Land on Master: Fix two new / free mismatches

core/src/fpdfdoc/doc_metadata.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 "../../include/fpdfdoc/fpdf_doc.h"
 #include "../../include/fxcrt/fx_xml.h"
 typedef struct _PDFDOC_METADATA {
     CPDF_Document *m_pDoc;
@@ skipping 10 matching lines @@
     "Producer", "Producer",
     "Creator", "CreatorTool",
     "CreationDate", "CreateDate",
     "ModDate", "ModifyDate",
     "MetadataDate", "MetadataDate"
 };
 CPDF_Metadata::CPDF_Metadata()
 {
     m_pData = FX_Alloc(PDFDOC_METADATA, 1);
     CFX_CMapByteStringToPtr *&pStringMap = ((PDFDOC_LPMETADATA)m_pData)->m_pStringMap;
-    pStringMap = FX_NEW(CFX_CMapByteStringToPtr);
+    pStringMap = FX_NEW CFX_CMapByteStringToPtr;
     if (pStringMap != NULL) {
         CFX_ByteString bstr;
         for (int i = 0; i < 18; i += 2) {
             bstr = gs_FPDFDOC_Metadata_Titles[i];
             pStringMap->AddValue(bstr, (void*)gs_FPDFDOC_Metadata_Titles[i + 1]);
         }
     }
 }
 CPDF_Metadata::~CPDF_Metadata()
 {
     FXSYS_assert(m_pData != NULL);
     CXML_Element *&p = ((PDFDOC_LPMETADATA)m_pData)->m_pXmlElmnt;
-    if (p) {
-        delete p;
-    }
+    delete p;
     CFX_CMapByteStringToPtr *pStringMap = ((PDFDOC_LPMETADATA)m_pData)->m_pStringMap;
     if (pStringMap) {
         pStringMap->RemoveAll();
-        FX_Free(pStringMap);
+        delete pStringMap;
     }
     FX_Free(m_pData);
 }
 void CPDF_Metadata::LoadDoc(CPDF_Document *pDoc)
 {
     FXSYS_assert(pDoc != NULL);
     ((PDFDOC_LPMETADATA)m_pData)->m_pDoc = pDoc;
     CPDF_Dictionary *pRoot = pDoc->GetRoot();
     CPDF_Stream *pStream = pRoot->GetStream(FX_BSTRC("Metadata"));
     if (!pStream) {
@@ skipping 81 matching lines @@
     return -1;
 }
 CXML_Element* CPDF_Metadata::GetRoot() const
 {
     return ((PDFDOC_LPMETADATA)m_pData)->m_pXmlElmnt;
 }
 CXML_Element* CPDF_Metadata::GetRDF() const
 {
     return ((PDFDOC_LPMETADATA)m_pData)->m_pElmntRdf;
 }