From 1dbfe996b946f0d2a1afc52669ff5fca22a85070 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 17 Apr 2018 17:19:30 +0000 Subject: Re-land "Return pdfium::span from ByteString::GetBuffer()."" This reverts commit 3d523e3cf89440e2ffc6571b1c687ad5e3f0318f. Fixes bounding errors now caught by tests. Change-Id: I4d0f1791bdcc45a10615a62abf7a4d20e7e538f2 Reviewed-on: https://pdfium-review.googlesource.com/30799 Commit-Queue: Tom Sepez Reviewed-by: dsinclair --- fxjs/cfxjse_formcalc_context.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'fxjs/cfxjse_formcalc_context.cpp') diff --git a/fxjs/cfxjse_formcalc_context.cpp b/fxjs/cfxjse_formcalc_context.cpp index 85d0ef8d57..a6d151b468 100644 --- a/fxjs/cfxjse_formcalc_context.cpp +++ b/fxjs/cfxjse_formcalc_context.cpp @@ -509,12 +509,16 @@ ByteString GUIDString(bool bSeparator) { data[6] = (data[6] & 0x0F) | 0x40; ByteString bsStr; - 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); + { + // 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]); + } } bsStr.ReleaseBuffer(bSeparator ? 36 : 32); return bsStr; -- cgit v1.2.3