commit d04de26cd0a4926eda543b2bf4efab5e5da5db72
author Tom Sepez <tsepez@chromium.org> Tue Dec 03 23:27:59 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Tue Dec 03 23:27:59 2019 +0000
tree 19be8a330702714e8e76cdd5931a47b1df13e6eb
parent 609b984ede8d0d54106d02cd62acd7dea4fb042d

Use buffers from the partition in CPDFSDK_FormFillEnvironment

- fix string_view_template.h to take an Allocator Type argument.

Change-Id: Ia67bebc8ad0d1145d7fd09e81a9c0e49e17798fd
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/62752
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>

core/fxcrt/string_view_template.h

diff --git a/core/fxcrt/string_view_template.h b/core/fxcrt/string_view_template.h
index 32f25cc..4a7c4a6 100644
--- a/core/fxcrt/string_view_template.h
+++ b/core/fxcrt/string_view_template.h
@@ -73,7 +73,9 @@
       : m_Span(reinterpret_cast<const UnsignedType*>(&ch), 1) {}
 
   // Any changes to |vec| invalidate the string.
-  explicit StringViewTemplate(const std::vector<UnsignedType>& vec) noexcept
+  template <typename AllocType>
+  explicit StringViewTemplate(
+      const std::vector<UnsignedType, AllocType>& vec) noexcept
       : m_Span(!vec.empty() ? vec.data() : nullptr, vec.size()) {}
 
   StringViewTemplate& operator=(const CharType* src) {

fpdfsdk/cpdfsdk_formfillenvironment.cpp

diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.cpp b/fpdfsdk/cpdfsdk_formfillenvironment.cpp
index 3c1dae5..8f9bdd1 100644
--- a/fpdfsdk/cpdfsdk_formfillenvironment.cpp
+++ b/fpdfsdk/cpdfsdk_formfillenvironment.cpp
@@ -8,10 +8,12 @@
 
 #include <memory>
 #include <utility>
+#include <vector>
 
 #include "core/fpdfapi/parser/cpdf_array.h"
 #include "core/fpdfapi/parser/cpdf_dictionary.h"
 #include "core/fpdfdoc/cpdf_docjsactions.h"
+#include "core/fxcrt/fx_memory_wrappers.h"
 #include "fpdfsdk/cpdfsdk_actionhandler.h"
 #include "fpdfsdk/cpdfsdk_annothandlermgr.h"
 #include "fpdfsdk/cpdfsdk_helpers.h"
@@ -128,7 +130,7 @@
   if (nRequiredLen <= 0)
     return WideString();
 
-  std::vector<uint8_t> pBuff(nRequiredLen);
+  std::vector<uint8_t, FxAllocAllocator<uint8_t>> pBuff(nRequiredLen);
   int nActualLen =
       m_pInfo->FFI_GetLanguage(m_pInfo, pBuff.data(), nRequiredLen);
   if (nActualLen <= 0 || nActualLen > nRequiredLen)
@@ -150,7 +152,7 @@
   if (nRequiredLen <= 0)
     return WideString();
 
-  std::vector<uint8_t> pBuff(nRequiredLen);
+  std::vector<uint8_t, FxAllocAllocator<uint8_t>> pBuff(nRequiredLen);
   int nActualLen =
       m_pInfo->FFI_GetPlatform(m_pInfo, pBuff.data(), nRequiredLen);
   if (nActualLen <= 0 || nActualLen > nRequiredLen)
@@ -218,7 +220,7 @@
   if (nRequiredLen <= 0)
     return WideString();
 
-  std::vector<uint8_t> pBuff(nRequiredLen);
+  std::vector<uint8_t, FxAllocAllocator<uint8_t>> pBuff(nRequiredLen);
   const int nActualLen = m_pInfo->m_pJsPlatform->Field_browse(
       m_pInfo->m_pJsPlatform, pBuff.data(), nRequiredLen);
   if (nActualLen <= 0 || nActualLen > nRequiredLen)
@@ -291,7 +293,7 @@
   if (nRequiredLen <= 0)
     return WideString();
 
-  std::vector<uint8_t> pBuff(nRequiredLen);
+  std::vector<uint8_t, FxAllocAllocator<uint8_t>> pBuff(nRequiredLen);
   const int nActualLen = m_pInfo->m_pJsPlatform->Doc_getFilePath(
       m_pInfo->m_pJsPlatform, pBuff.data(), nRequiredLen);
   if (nActualLen <= 0 || nActualLen > nRequiredLen)