Index: core/src/fpdfdoc/doc_metadata.cpp |
diff --git a/core/src/fpdfdoc/doc_metadata.cpp b/core/src/fpdfdoc/doc_metadata.cpp |
index bf55527d62c4872bcf01affa4da5495c53b6e4e7..232f6eea21534398cb7aa9a6e1de32ae582c0f8f 100644 |
--- a/core/src/fpdfdoc/doc_metadata.cpp |
+++ b/core/src/fpdfdoc/doc_metadata.cpp |
@@ -28,7 +28,7 @@ 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) { |
@@ -41,13 +41,11 @@ 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); |
} |