2 files changed, 9 insertions, 16 deletions
diff --git a/fxjs/cfxjse_formcalc_context.cpp b/fxjs/cfxjse_formcalc_context.cpp
index a6d151b468..85d0ef8d57 100644
--- a/fxjs/cfxjse_formcalc_context.cpp
+++ b/fxjs/cfxjse_formcalc_context.cpp
@@ -509,16 +509,12 @@ ByteString GUIDString(bool bSeparator) {
   data[6] = (data[6] & 0x0F) | 0x40;
 
   ByteString bsStr;
-  {
-    // Span's lifetime must end before ReleaseBuffer() below.
-    pdfium::span<char> pBuf = bsStr.GetBuffer(40);
-    size_t out_index = 0;
-    for (size_t i = 0; i < 16; ++i, out_index += 2) {
-      if (bSeparator && (i == 4 || i == 6 || i == 8 || i == 10))
-        pBuf[out_index++] = L'-';
-
-      FXSYS_IntToTwoHexChars(data[i], &pBuf[out_index]);
-    }
+  char* pBuf = bsStr.GetBuffer(40);
+  for (int32_t i = 0; i < 16; ++i, pBuf += 2) {
+    if (bSeparator && (i == 4 || i == 6 || i == 8 || i == 10))
+      *pBuf++ = L'-';
+
+    FXSYS_IntToTwoHexChars(data[i], pBuf);
   }
   bsStr.ReleaseBuffer(bSeparator ? 36 : 32);
   return bsStr;
diff --git a/fxjs/cjs_publicmethods.cpp b/fxjs/cjs_publicmethods.cpp
index 8dc69c4a00..375eb6fd88 100644
--- a/fxjs/cjs_publicmethods.cpp
+++ b/fxjs/cjs_publicmethods.cpp
@@ -10,7 +10,6 @@
 #include <cmath>
 #include <cwctype>
 #include <iomanip>
-#include <iterator>
 #include <limits>
 #include <sstream>
 #include <string>
@@ -1095,12 +1094,10 @@ CJS_Return CJS_PublicMethods::AFPercent_Format(
 
   if (iDec2 < 0) {
     ByteString zeros;
-    {
-      pdfium::span<char> zeros_ptr = zeros.GetBuffer(abs(iDec2));
-      std::fill(std::begin(zeros_ptr), std::end(zeros_ptr), '0');
-    }
-    zeros.ReleaseBuffer(abs(iDec2));
+    char* zeros_ptr = zeros.GetBuffer(abs(iDec2));
+    memset(zeros_ptr, '0', abs(iDec2));
     strValue = zeros + strValue;
+
     iDec2 = 0;
   }
   int iMax = strValue.GetLength();