Replace Release() { delete this; } in fde_xml_imp.h

xfa/fde/xml/fde_xml_imp.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 "xfa/fde/xml/fde_xml_imp.h"
 
 #include <algorithm>
 
@@ skipping 59 matching lines @@
     }
   }
   return FALSE;
 }
 
 CFDE_XMLNode::CFDE_XMLNode()
     : m_pParent(NULL), m_pChild(NULL), m_pPrior(NULL), m_pNext(NULL) {}
 CFDE_XMLNode::~CFDE_XMLNode() {
   DeleteChildren();
 }
+
 void CFDE_XMLNode::DeleteChildren() {
-  CFDE_XMLNode *pChild = m_pChild, *pTemp;
-  while (pChild != NULL) {
-    pTemp = pChild->m_pNext;
-    pChild->Release();
-    pChild = pTemp;
+  CFDE_XMLNode* pChild = m_pChild;
+  while (pChild) {
+    CFDE_XMLNode* pNext = pChild->m_pNext;
+    delete pChild;
+    pChild = pNext;
   }
-  m_pChild = NULL;
+  m_pChild = nullptr;
 }
+
 int32_t CFDE_XMLNode::CountChildNodes() const {
   int32_t iCount = 0;
   CFDE_XMLNode* pChild = m_pChild;
   while (pChild != NULL) {
     iCount++;
     pChild = pChild->m_pNext;
   }
   return iCount;
 }
 CFDE_XMLNode* CFDE_XMLNode::GetChildNode(int32_t index) const {
@@ skipping 404 matching lines @@
     pCloneNext->InsertNodeItem(CFDE_XMLNode::NextSibling, pChild);
     pCloneNext = pChild;
     pNext = pNext->m_pNext;
   }
 }
 
 CFDE_XMLInstruction::CFDE_XMLInstruction(const CFX_WideString& wsTarget)
     : m_wsTarget(wsTarget) {
   ASSERT(m_wsTarget.GetLength() > 0);
 }
+
+CFDE_XMLInstruction::~CFDE_XMLInstruction() {}
+
 CFDE_XMLNode* CFDE_XMLInstruction::Clone(FX_BOOL bRecursive) {
   CFDE_XMLInstruction* pClone = new CFDE_XMLInstruction(m_wsTarget);
   if (!pClone) {
     return pClone;
   }
   pClone->m_Attributes.Copy(m_Attributes);
   pClone->m_TargetData.Copy(m_TargetData);
   if (bRecursive) {
     CloneChildren(pClone);
   }
@@ skipping 297 matching lines @@
     pChild = pChild->m_pNext;
   }
   wsText = buffer.AsStringC();
 }
 void CFDE_XMLElement::SetTextData(const CFX_WideString& wsText) {
   if (wsText.GetLength() < 1) {
     return;
   }
   InsertChildNode(new CFDE_XMLText(wsText));
 }
+
 CFDE_XMLText::CFDE_XMLText(const CFX_WideString& wsText)
     : CFDE_XMLNode(), m_wsText(wsText) {}
+
+CFDE_XMLText::~CFDE_XMLText() {}
+
 CFDE_XMLNode* CFDE_XMLText::Clone(FX_BOOL bRecursive) {
   CFDE_XMLText* pClone = new CFDE_XMLText(m_wsText);
   return pClone;
 }
 
 CFDE_XMLCharData::CFDE_XMLCharData(const CFX_WideString& wsCData)
     : CFDE_XMLDeclaration(), m_wsCharData(wsCData) {}
+
+CFDE_XMLCharData::~CFDE_XMLCharData() {}
+
 CFDE_XMLNode* CFDE_XMLCharData::Clone(FX_BOOL bRecursive) {
   CFDE_XMLCharData* pClone = new CFDE_XMLCharData(m_wsCharData);
   return pClone;
 }
 
 CFDE_XMLDoc::CFDE_XMLDoc()
     : m_pRoot(NULL), m_pSyntaxParser(NULL), m_pXMLParser(NULL) {
   Reset(TRUE);
   CFDE_XMLInstruction* pXML = new CFDE_XMLInstruction(L"xml");
   m_pRoot->InsertChildNode(pXML);
 }
 CFDE_XMLDoc::~CFDE_XMLDoc() {
   Reset(FALSE);
 }
 void CFDE_XMLDoc::Reset(FX_BOOL bInitRoot) {
   m_iStatus = 0;
   m_pStream = NULL;
   if (bInitRoot) {
     if (m_pRoot == NULL) {
       m_pRoot = new CFDE_XMLNode;
     } else {
       m_pRoot->DeleteChildren();
     }
   } else {
-    if (m_pRoot != NULL) {
-      m_pRoot->Release();
-      m_pRoot = NULL;
-    }
+    delete m_pRoot;
+    m_pRoot = nullptr;
   }
   ReleaseParser();
 }
+
 void CFDE_XMLDoc::ReleaseParser() {
-  if (m_pXMLParser != NULL) {
-    m_pXMLParser->Release();
-    m_pXMLParser = NULL;
-  }
-  if (m_pSyntaxParser != NULL) {
-    m_pSyntaxParser->Release();
-    m_pSyntaxParser = NULL;
-  }
+  delete m_pXMLParser;
+  m_pXMLParser = nullptr;
+  delete m_pSyntaxParser;
+  m_pSyntaxParser = nullptr;
 }
+
 FX_BOOL CFDE_XMLDoc::LoadXML(IFX_Stream* pXMLStream,
                              int32_t iXMLPlaneSize,
                              int32_t iTextDataSize,
                              FDE_XMLREADERHANDLER* pHandler) {
   if (pXMLStream == NULL) {
     return FALSE;
   }
   Reset(TRUE);
   iXMLPlaneSize = iXMLPlaneSize / 1024;
   if (iXMLPlaneSize < 1) {
@@ skipping 22 matching lines @@
     return FALSE;
   }
   m_pSyntaxParser->Init(m_pStream, iXMLPlaneSize, iTextDataSize);
   if (pHandler == NULL) {
     m_pXMLParser = new CFDE_XMLDOMParser(m_pRoot, m_pSyntaxParser);
   } else {
     m_pXMLParser = new CFDE_XMLSAXParser(pHandler, m_pSyntaxParser);
   }
   return TRUE;
 }
-FX_BOOL CFDE_XMLDoc::LoadXML(CFDE_XMLParser* pXMLParser) {
-  if (pXMLParser == NULL) {
+
+FX_BOOL CFDE_XMLDoc::LoadXML(IFDE_XMLParser* pXMLParser) {
+  if (!pXMLParser)
     return FALSE;
-  }
+
   Reset(TRUE);
   m_pXMLParser = pXMLParser;
-  return m_pXMLParser != NULL;
+  return TRUE;
 }
+
 int32_t CFDE_XMLDoc::DoLoad(IFX_Pause* pPause) {
   if (m_iStatus >= 100) {
     return m_iStatus;
   }
-  ASSERT(m_pXMLParser != NULL);
   return m_iStatus = m_pXMLParser->DoParser(pPause);
 }
+
 void CFDE_XMLDoc::CloseXML() {
   ReleaseParser();
 }
 void CFDE_XMLDoc::SaveXMLNode(IFX_Stream* pXMLStream, CFDE_XMLNode* pINode) {
   CFDE_XMLNode* pNode = (CFDE_XMLNode*)pINode;
   ASSERT(pXMLStream != NULL && pNode != NULL);
   switch (pNode->GetType()) {
     case FDE_XMLNODE_Instruction: {
       CFX_WideString ws;
       CFDE_XMLInstruction* pInstruction = (CFDE_XMLInstruction*)pNode;
@@ skipping 1126 matching lines @@
     m_BlockBuffer.DeleteTextChars(m_iDataLength - m_iEntityStart, FALSE);
     m_pCurrentBlock = m_BlockBuffer.GetAvailableBlock(m_iIndexInBlock);
     m_iEntityStart = -1;
   } else {
     if (m_iEntityStart < 0 && ch == L'&') {
       m_iEntityStart = m_iDataLength - 1;
     }
   }
   m_pStart++;
 }