commit 3419af426bd572e23f3e8b0ab994589e3e4020af
author Lei Zhang <thestig@chromium.org> Fri Apr 05 22:13:13 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Fri Apr 05 22:13:13 2019 +0000
tree 1c3e0c6136dbb079dc25a16d451751fc65865821
parent 7e4877f634e4e4db77ec1a26974cd314a2f004db

Use span in GetFPDFWideString().

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

testing/fx_string_testhelpers.cpp

diff --git a/testing/fx_string_testhelpers.cpp b/testing/fx_string_testhelpers.cpp
index d8e9661..e13bd2d 100644
--- a/testing/fx_string_testhelpers.cpp
+++ b/testing/fx_string_testhelpers.cpp
@@ -8,6 +8,7 @@
 #include <ios>
 
 #include "core/fxcrt/fx_string.h"
+#include "third_party/base/span.h"
 
 std::ostream& operator<<(std::ostream& os, const CFX_DateTime& dt) {
   os << dt.GetYear() << "-" << std::to_string(dt.GetMonth()) << "-"
@@ -60,13 +61,14 @@
   size_t length = sizeof(uint16_t) * (wstr.length() + 1);
   std::unique_ptr<unsigned short, pdfium::FreeDeleter> result(
       static_cast<unsigned short*>(malloc(length)));
-  char* ptr = reinterpret_cast<char*>(result.get());
+  pdfium::span<uint8_t> result_span(reinterpret_cast<uint8_t*>(result.get()),
+                                    length);
   size_t i = 0;
   for (wchar_t w : wstr) {
-    ptr[i++] = w & 0xff;
-    ptr[i++] = (w >> 8) & 0xff;
+    result_span[i++] = w & 0xff;
+    result_span[i++] = (w >> 8) & 0xff;
   }
-  ptr[i++] = 0;
-  ptr[i] = 0;
+  result_span[i++] = 0;
+  result_span[i] = 0;
   return result;
 }