From 3d523e3cf89440e2ffc6571b1c687ad5e3f0318f Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 16 Apr 2018 17:28:17 +0000 Subject: Revert "Return pdfium::span 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 Reviewed-by: Tom Sepez Reviewed-by: dsinclair --- fxjs/cfxjse_formcalc_context.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'fxjs/cfxjse_formcalc_context.cpp') 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 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; -- cgit v1.2.3