4 files changed, 20 insertions, 16 deletions
diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp
index 645f907525..509decd037 100644
--- a/xfa/fxfa/parser/cxfa_node.cpp
+++ b/xfa/fxfa/parser/cxfa_node.cpp
@@ -1055,7 +1055,7 @@ void CXFA_Node::Script_Som_ResolveNodeList(CFXJSE_Value* pValue,
     }
   } else {
     CXFA_ValueArray valueArray(pScriptContext->GetRuntime());
-    if (resoveNodeRS.GetAttributeResult(valueArray) > 0) {
+    if (resoveNodeRS.GetAttributeResult(&valueArray) > 0) {
       for (CXFA_Object* pObject : valueArray.GetAttributeObject()) {
         if (pObject->IsNode())
           pNodeList->Append(pObject->AsNode());
diff --git a/xfa/fxfa/parser/cxfa_valuearray.cpp b/xfa/fxfa/parser/cxfa_valuearray.cpp
index 1170010139..eded624c36 100644
--- a/xfa/fxfa/parser/cxfa_valuearray.cpp
+++ b/xfa/fxfa/parser/cxfa_valuearray.cpp
@@ -6,20 +6,20 @@
 
 #include "xfa/fxfa/parser/cxfa_valuearray.h"
 
+#include <algorithm>
+
 #include "xfa/fxfa/parser/cxfa_scriptcontext.h"
 
 CXFA_ValueArray::CXFA_ValueArray(v8::Isolate* pIsolate)
     : m_pIsolate(pIsolate) {}
 
-CXFA_ValueArray::~CXFA_ValueArray() {
-  for (int32_t i = 0; i < GetSize(); i++)
-    delete GetAt(i);
-}
+CXFA_ValueArray::~CXFA_ValueArray() {}
 
 std::vector<CXFA_Object*> CXFA_ValueArray::GetAttributeObject() {
-  std::vector<CXFA_Object*> objArray;
-  for (int32_t i = 0; i < GetSize(); i++)
-    objArray.push_back(CXFA_ScriptContext::ToObject(GetAt(i), nullptr));
-
-  return objArray;
+  std::vector<CXFA_Object*> result(m_Values.size());
+  std::transform(m_Values.begin(), m_Values.end(), result.begin(),
+                 [](const std::unique_ptr<CFXJSE_Value>& value) {
+                   return CXFA_ScriptContext::ToObject(value.get(), nullptr);
+                 });
+  return result;
 }
diff --git a/xfa/fxfa/parser/cxfa_valuearray.h b/xfa/fxfa/parser/cxfa_valuearray.h
index 48efae4774..f0c5d234c9 100644
--- a/xfa/fxfa/parser/cxfa_valuearray.h
+++ b/xfa/fxfa/parser/cxfa_valuearray.h
@@ -7,12 +7,13 @@
 #ifndef XFA_FXFA_PARSER_CXFA_VALUEARRAY_H_
 #define XFA_FXFA_PARSER_CXFA_VALUEARRAY_H_
 
+#include <memory>
 #include <vector>
 
 #include "fxjs/cfxjse_value.h"
 #include "xfa/fxfa/fxfa.h"
 
-class CXFA_ValueArray : public CFX_ArrayTemplate<CFXJSE_Value*> {
+class CXFA_ValueArray {
  public:
   explicit CXFA_ValueArray(v8::Isolate* pIsolate);
   ~CXFA_ValueArray();
@@ -20,6 +21,7 @@ class CXFA_ValueArray : public CFX_ArrayTemplate<CFXJSE_Value*> {
   std::vector<CXFA_Object*> GetAttributeObject();
 
   v8::Isolate* const m_pIsolate;
+  std::vector<std::unique_ptr<CFXJSE_Value>> m_Values;
 };
 
 #endif  // XFA_FXFA_PARSER_CXFA_VALUEARRAY_H_
diff --git a/xfa/fxfa/parser/xfa_resolvenode_rs.h b/xfa/fxfa/parser/xfa_resolvenode_rs.h
index a60ef9a3c6..a30d540ef0 100644
--- a/xfa/fxfa/parser/xfa_resolvenode_rs.h
+++ b/xfa/fxfa/parser/xfa_resolvenode_rs.h
@@ -8,6 +8,7 @@
 #define XFA_FXFA_PARSER_XFA_RESOLVENODE_RS_H_
 
 #include <memory>
+#include <utility>
 #include <vector>
 
 #include "fxjs/cfxjse_value.h"
@@ -45,16 +46,17 @@ struct XFA_RESOLVENODE_RS {
   XFA_RESOLVENODE_RS();
   ~XFA_RESOLVENODE_RS();
 
-  int32_t GetAttributeResult(CXFA_ValueArray& valueArray) const {
+  size_t GetAttributeResult(CXFA_ValueArray* valueArray) const {
     if (pScriptAttribute && pScriptAttribute->eValueType == XFA_SCRIPT_Object) {
       for (CXFA_Object* pObject : objects) {
-        auto pValue = pdfium::MakeUnique<CFXJSE_Value>(valueArray.m_pIsolate);
+        auto pValue = pdfium::MakeUnique<CFXJSE_Value>(valueArray->m_pIsolate);
         (pObject->*(pScriptAttribute->lpfnCallback))(
-            pValue.get(), false, (XFA_ATTRIBUTE)pScriptAttribute->eAttribute);
-        valueArray.Add(pValue.release());
+            pValue.get(), false,
+            static_cast<XFA_ATTRIBUTE>(pScriptAttribute->eAttribute));
+        valueArray->m_Values.push_back(std::move(pValue));
       }
     }
-    return valueArray.GetSize();
+    return valueArray->m_Values.size();
   }
 
   std::vector<CXFA_Object*> objects;  // Not owned.