summaryrefslogtreecommitdiff
path: root/fxjs/cfxjse_formcalc_context.cpp
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2018-04-16 17:28:17 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-04-16 17:28:17 +0000
commit3d523e3cf89440e2ffc6571b1c687ad5e3f0318f (patch)
treeb546904778c288c9ee9100f8e9da2761a9acc2cb /fxjs/cfxjse_formcalc_context.cpp
parentc51196cac2963d94cb0c6434f870fcea83d5c509 (diff)
downloadpdfium-3d523e3cf89440e2ffc6571b1c687ad5e3f0318f.tar.xz
Revert "Return pdfium::span<char> from ByteString::GetBuffer()."
This reverts commit 80a6cbe0a427e155de8555bc867af745d10f9777. Reason for revert: too many abrts in beta branch. TBR: dsinclair@chromium.org Bug: 832557, 832978, 832992, 833062, 833097 Change-Id: I7d511dbb224ddc644be96ea2f3770ad6f73debf5 Reviewed-on: https://pdfium-review.googlesource.com/30792 Commit-Queue: Tom Sepez <tsepez@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org> Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fxjs/cfxjse_formcalc_context.cpp')
-rw-r--r--fxjs/cfxjse_formcalc_context.cpp16
1 files changed, 6 insertions, 10 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;