From 80a6cbe0a427e155de8555bc867af745d10f9777 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 12 Apr 2018 19:45:45 +0000 Subject: Return pdfium::span from ByteString::GetBuffer(). Get bounds checking "for free". Change-Id: I7b14cacbc7130ced7b5cb1869b82c96ccff8e642 Reviewed-on: https://pdfium-review.googlesource.com/30451 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