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

xfa/fxfa/app/xfa_ffdoc.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/fxfa/include/xfa_ffdoc.h"
 
 #include <algorithm>
-#include <memory>
 
 #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
 #include "core/fpdfdoc/include/fpdf_doc.h"
 #include "core/fxcrt/include/fx_ext.h"
 #include "core/fxcrt/include/fx_memory.h"
 #include "xfa/fde/xml/fde_xml_imp.h"
 #include "xfa/fgas/crt/fgas_algorithm.h"
 #include "xfa/fwl/core/fwl_noteimp.h"
 #include "xfa/fxfa/app/xfa_ffnotify.h"
@@ skipping 118 matching lines @@
     }
     if (!pXFAReader) {
       return XFA_PARSESTATUS_SyntaxErr;
     }
     CPDF_Document* pPDFDocument =
         GetDocProvider()->OpenPDF(this, pXFAReader, TRUE);
     ASSERT(!m_pPDFDoc);
     if (!OpenDoc(pPDFDocument)) {
       return XFA_PARSESTATUS_SyntaxErr;
     }
-    std::unique_ptr<IXFA_Parser> pParser(
-        IXFA_Parser::Create(m_pDocument, TRUE));
-    if (!pParser)
+    IXFA_Parser* pParser = IXFA_Parser::Create(m_pDocument, TRUE);
+    if (!pParser) {
       return XFA_PARSESTATUS_SyntaxErr;
-
+    }
     CXFA_Node* pRootNode = NULL;
     if (pParser->StartParse(m_pStream) == XFA_PARSESTATUS_Ready &&
         pParser->DoParse(NULL) == XFA_PARSESTATUS_Done) {
       pRootNode = pParser->GetRootNode();
     }
     if (pRootNode && m_pDocument->GetRoot()) {
       XFA_XPDPacket_MergeRootNode(m_pDocument->GetRoot(), pRootNode);
       iStatus = XFA_PARSESTATUS_Done;
     } else {
       iStatus = XFA_PARSESTATUS_StatusErr;
     }
+    pParser->Release();
+    pParser = NULL;
   }
   return iStatus;
 }
 void CXFA_FFDoc::StopLoad() {
   m_pApp->GetXFAFontMgr()->LoadDocFonts(this);
   m_dwDocType = XFA_DOCTYPE_Static;
   CXFA_Node* pConfig = ToNode(m_pDocument->GetXFAObject(XFA_HASHCODE_Config));
   if (!pConfig) {
     return;
   }
@@ skipping 83 matching lines @@
 FX_BOOL CXFA_FFDoc::CloseDoc() {
   for (const auto& pair : m_TypeToDocViewMap)
     pair.second->RunDocClose();
 
   if (m_pDocument)
     m_pDocument->ClearLayoutData();
 
   m_TypeToDocViewMap.clear();
 
   if (m_pDocument) {
-    m_pDocument->DestroyParser();
+    m_pDocument->GetParser()->Release();
     m_pDocument = nullptr;
   }
 
   delete m_pNotify;
   m_pNotify = nullptr;
 
   m_pApp->GetXFAFontMgr()->ReleaseDocFonts(this);
 
   if (m_dwDocType != XFA_DOCTYPE_XDP && m_pStream && m_bOwnStream) {
     m_pStream->Release();
@@ skipping 107 matching lines @@
   }
   pExport->Release();
   return bFlags;
 }
 FX_BOOL CXFA_FFDoc::ImportData(IFX_FileRead* pStream, FX_BOOL bXDP) {
   std::unique_ptr<CXFA_DataImporter, ReleaseDeleter<CXFA_DataImporter>>
       importer(new CXFA_DataImporter(m_pDocument));
 
   return importer->ImportData(pStream);
 }