More unique_ptrs in CXFA_FMParse::ParseForeachExpression and avoid leaks

xfa/fxfa/fm2js/xfa_expression.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/fm2js/xfa_expression.h"
 
 #include <utility>
 
@@ skipping 492 matching lines @@
     javascript << FX_WSTRC(L"1");
   }
   javascript << FX_WSTRC(L")\n");
   m_pList->ToImpliedReturnJS(javascript);
   javascript << FX_WSTRC(L"}\n");
 }
 
 CXFA_FMForeachExpression::CXFA_FMForeachExpression(
     uint32_t line,
     const CFX_WideStringC& wsIdentifier,
-    CFX_ArrayTemplate<CXFA_FMSimpleExpression*>* pAccessors,
+    std::vector<std::unique_ptr<CXFA_FMSimpleExpression>>&& pAccessors,
     CXFA_FMExpression* pList)
     : CXFA_FMLoopExpression(line),
       m_wsIdentifier(wsIdentifier),
-      m_pAccessors(pAccessors),
+      m_pAccessors(std::move(pAccessors)),
       m_pList(pList) {}
 
-CXFA_FMForeachExpression::~CXFA_FMForeachExpression() {
-  if (m_pAccessors) {
-    for (int i = 0; i < m_pAccessors->GetSize(); ++i)
-      m_pAccessors->GetAt(i);
-
-    delete m_pAccessors;
-  }
-}
+CXFA_FMForeachExpression::~CXFA_FMForeachExpression() {}
 
 void CXFA_FMForeachExpression::ToJavaScript(CFX_WideTextBuf& javascript) {
   javascript << FX_WSTRC(L"{\n");
   javascript << FX_WSTRC(L"var ");
   if (m_wsIdentifier.GetAt(0) == L'!') {
     CFX_WideString tempIdentifier =
         EXCLAMATION_IN_IDENTIFIER + m_wsIdentifier.Mid(1);
     javascript << tempIdentifier;
   } else {
     javascript << m_wsIdentifier;
   }
   javascript << FX_WSTRC(L" = null;\n");
   javascript << FX_WSTRC(L"var ");
   javascript << RUNTIMEBLOCKTEMPARRAY;
   javascript << FX_WSTRC(L" = ");
   javascript << XFA_FM_EXPTypeToString(CONCATFMOBJECT);
   javascript << FX_WSTRC(L"(");
 
-  for (int i = 0; i < m_pAccessors->GetSize(); ++i) {
-    CXFA_FMSimpleExpression* s = m_pAccessors->GetAt(i);
+  for (size_t i = 0; i < m_pAccessors.size(); ++i) {
+    CXFA_FMSimpleExpression* s = m_pAccessors.at(i).get();
     s->ToJavaScript(javascript);
-    if (i + 1 < m_pAccessors->GetSize()) {
+    if (i + 1 < m_pAccessors.size()) {
       javascript << FX_WSTRC(L", ");
     }
   }
   javascript << FX_WSTRC(L");\n");
   javascript << FX_WSTRC(L"var ");
   javascript << RUNTIMEBLOCKTEMPARRAYINDEX;
   javascript << FX_WSTRC(L" = 0;\n");
   javascript << FX_WSTRC(L"while(");
   javascript << RUNTIMEBLOCKTEMPARRAYINDEX;
   javascript << FX_WSTRC(L" < ");
@@ skipping 27 matching lines @@
     javascript << tempIdentifier;
   } else {
     javascript << m_wsIdentifier;
   }
   javascript << FX_WSTRC(L" = null;\n");
   javascript << FX_WSTRC(L"var ");
   javascript << RUNTIMEBLOCKTEMPARRAY;
   javascript << FX_WSTRC(L" = ");
   javascript << XFA_FM_EXPTypeToString(CONCATFMOBJECT);
   javascript << FX_WSTRC(L"(");
-  for (int i = 0; i < m_pAccessors->GetSize(); ++i) {
-    CXFA_FMSimpleExpression* s = m_pAccessors->GetAt(i);
+  for (size_t i = 0; i < m_pAccessors.size(); ++i) {
+    CXFA_FMSimpleExpression* s = m_pAccessors.at(i).get();
     s->ToJavaScript(javascript);
-    if (i + 1 < m_pAccessors->GetSize()) {
+    if (i + 1 < m_pAccessors.size()) {
       javascript << FX_WSTRC(L", ");
     }
   }
   javascript << FX_WSTRC(L");\n");
   javascript << FX_WSTRC(L"var ");
   javascript << RUNTIMEBLOCKTEMPARRAYINDEX;
   javascript << FX_WSTRC(L" = 0;\n");
   javascript << FX_WSTRC(L"while(");
   javascript << RUNTIMEBLOCKTEMPARRAYINDEX;
   javascript << FX_WSTRC(L" < ");
   javascript << RUNTIMEBLOCKTEMPARRAY;
   javascript << FX_WSTRC(L".length)\n{\n");
   if (m_wsIdentifier.GetAt(0) == L'!') {
     CFX_WideString tempIdentifier =
         EXCLAMATION_IN_IDENTIFIER + m_wsIdentifier.Mid(1);
     javascript << tempIdentifier;
   } else {
     javascript << m_wsIdentifier;
   }
   javascript << FX_WSTRC(L" = ");
   javascript << RUNTIMEBLOCKTEMPARRAY;
   javascript << FX_WSTRC(L"[");
   javascript << RUNTIMEBLOCKTEMPARRAYINDEX;
   javascript << FX_WSTRC(L"++];\n");
   m_pList->ToImpliedReturnJS(javascript);
   javascript << FX_WSTRC(L"}\n");
   javascript << FX_WSTRC(L"}\n");
 }