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

xfa/fxfa/parser/xfa_document_serialize.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/parser/xfa_document_serialize.h"
 
+#include <memory>
+
 #include "xfa/fde/xml/fde_xml_imp.h"
 #include "xfa/fgas/crt/fgas_codepage.h"
 #include "xfa/fxfa/fm2js/xfa_fm2jsapi.h"
 #include "xfa/fxfa/parser/xfa_doclayout.h"
 #include "xfa/fxfa/parser/xfa_document.h"
 #include "xfa/fxfa/parser/xfa_localemgr.h"
 #include "xfa/fxfa/parser/xfa_object.h"
 #include "xfa/fxfa/parser/xfa_parser.h"
 #include "xfa/fxfa/parser/xfa_parser_imp.h"
 #include "xfa/fxfa/parser/xfa_script.h"
 #include "xfa/fxfa/parser/xfa_utils.h"
 
 CXFA_DataImporter::CXFA_DataImporter(CXFA_Document* pDocument)
     : m_pDocument(pDocument) {
   ASSERT(m_pDocument);
 }
+
 FX_BOOL CXFA_DataImporter::ImportData(IFX_FileRead* pDataDocument) {
-  IXFA_Parser* pDataDocumentParser = IXFA_Parser::Create(m_pDocument);
-  if (!pDataDocumentParser) {
+  std::unique_ptr<IXFA_Parser> pDataDocumentParser(
+      IXFA_Parser::Create(m_pDocument));
+  if (!pDataDocumentParser)

[Lei Zhang, 2016/05/16 20:38:09]

Always evals to false?

[Tom Sepez, 2016/05/16 21:29:06]

Done.

+    return FALSE;
+
+  if (pDataDocumentParser->StartParse(pDataDocument, XFA_XDPPACKET_Datasets) !=
+      XFA_PARSESTATUS_Ready) {
     return FALSE;
   }
-  if (pDataDocumentParser->StartParse(pDataDocument, XFA_XDPPACKET_Datasets) !=
-      XFA_PARSESTATUS_Ready) {
-    pDataDocumentParser->Release();
+  if (pDataDocumentParser->DoParse(nullptr) < XFA_PARSESTATUS_Done)
     return FALSE;
-  }
-  if (pDataDocumentParser->DoParse(NULL) < XFA_PARSESTATUS_Done) {
-    pDataDocumentParser->Release();
+
+  CXFA_Node* pImportDataRoot = pDataDocumentParser->GetRootNode();
+  if (!pImportDataRoot)
     return FALSE;
-  }
-  CXFA_Node* pImportDataRoot = pDataDocumentParser->GetRootNode();
-  if (!pImportDataRoot) {
-    pDataDocumentParser->Release();
-    return FALSE;
-  }
+
   CXFA_Node* pDataModel =
       ToNode(m_pDocument->GetXFAObject(XFA_HASHCODE_Datasets));
-  if (!pDataModel) {
-    pDataDocumentParser->Release();
+  if (!pDataModel)
     return FALSE;
-  }
+
   CXFA_Node* pDataNode = ToNode(m_pDocument->GetXFAObject(XFA_HASHCODE_Data));
   if (pDataNode) {
     pDataModel->RemoveChild(pDataNode);
   }
   if (pImportDataRoot->GetClassID() == XFA_ELEMENT_DataModel) {
     while (CXFA_Node* pChildNode =
                pImportDataRoot->GetNodeItem(XFA_NODEITEM_FirstChild)) {
       pImportDataRoot->RemoveChild(pChildNode);
       pDataModel->InsertChild(pChildNode);
     }
   } else {
     CFDE_XMLNode* pXMLNode = pImportDataRoot->GetXMLMappingNode();
     CFDE_XMLNode* pParentXMLNode = pXMLNode->GetNodeItem(CFDE_XMLNode::Parent);
     if (pParentXMLNode) {
       pParentXMLNode->RemoveChildNode(pXMLNode);
     }
     pDataModel->InsertChild(pImportDataRoot);
   }
   m_pDocument->DoDataRemerge(FALSE);
-  pDataDocumentParser->Release();
   return TRUE;
 }
+
 CFX_WideString XFA_ExportEncodeAttribute(const CFX_WideString& str) {
   CFX_WideTextBuf textBuf;
   int32_t iLen = str.GetLength();
   for (int32_t i = 0; i < iLen; i++) {
     switch (str[i]) {
       case '&':
         textBuf << FX_WSTRC(L"&amp;");
         break;
       case '<':
         textBuf << FX_WSTRC(L"&lt;");
@@ skipping 492 matching lines @@
         pXMLElement->RemoveAttribute(L"xfa:dataNode");
       }
     } else {
       CFDE_XMLNode* pXMLNode = pDataNode->GetXMLMappingNode();
       ASSERT(pXMLNode->GetType() == FDE_XMLNODE_Element);
       static_cast<CFDE_XMLElement*>(pXMLNode)->SetString(L"xfa:dataNode",
                                                          L"dataGroup");
     }
   }
 }