diff options
author | Tom Sepez <tsepez@chromium.org> | 2018-04-12 19:45:45 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-04-12 19:45:45 +0000 |
commit | 80a6cbe0a427e155de8555bc867af745d10f9777 (patch) | |
tree | f5a01546d4081a4c3618350f4b54d13690d30299 /core/fpdfapi/parser/fpdf_parser_decode.cpp | |
parent | 154e18f9a862975abecebe77b8f5fb418418d14c (diff) | |
download | pdfium-80a6cbe0a427e155de8555bc867af745d10f9777.tar.xz |
Return pdfium::span<char> from ByteString::GetBuffer().
Get bounds checking "for free".
Change-Id: I7b14cacbc7130ced7b5cb1869b82c96ccff8e642
Reviewed-on: https://pdfium-review.googlesource.com/30451
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fpdfapi/parser/fpdf_parser_decode.cpp')
-rw-r--r-- | core/fpdfapi/parser/fpdf_parser_decode.cpp | 45 |
1 files changed, 25 insertions, 20 deletions
diff --git a/core/fpdfapi/parser/fpdf_parser_decode.cpp b/core/fpdfapi/parser/fpdf_parser_decode.cpp index 90dca2edcb..2fdc4daa49 100644 --- a/core/fpdfapi/parser/fpdf_parser_decode.cpp +++ b/core/fpdfapi/parser/fpdf_parser_decode.cpp @@ -469,20 +469,22 @@ ByteString PDF_EncodeText(const wchar_t* pString, int len) { if (len == -1) len = wcslen(pString); - ByteString result; - char* dest_buf1 = result.GetBuffer(len); int i; - for (i = 0; i < len; ++i) { - int code; - for (code = 0; code < 256; ++code) { - if (PDFDocEncoding[code] == pString[i]) - break; - } + ByteString result; + { + pdfium::span<char> dest_buf = result.GetBuffer(len); + for (i = 0; i < len; ++i) { + int code; + for (code = 0; code < 256; ++code) { + if (PDFDocEncoding[code] == pString[i]) + break; + } - if (code == 256) - break; + if (code == 256) + break; - dest_buf1[i] = code; + dest_buf[i] = code; + } } result.ReleaseBuffer(i); if (i == len) @@ -493,15 +495,18 @@ ByteString PDF_EncodeText(const wchar_t* pString, int len) { return result; } - int encLen = len * 2 + 2; - - uint8_t* dest_buf2 = reinterpret_cast<uint8_t*>(result.GetBuffer(encLen)); - dest_buf2[0] = 0xfe; - dest_buf2[1] = 0xff; - dest_buf2 += 2; - for (int j = 0; j < len; ++j) { - *dest_buf2++ = pString[j] >> 8; - *dest_buf2++ = static_cast<uint8_t>(pString[j]); + size_t dest_index = 0; + size_t encLen = len * 2 + 2; + { + pdfium::span<char> cspan = result.GetBuffer(encLen); + auto dest_buf = pdfium::make_span(reinterpret_cast<uint8_t*>(cspan.data()), + cspan.size()); + dest_buf[dest_index++] = 0xfe; + dest_buf[dest_index++] = 0xff; + for (int j = 0; j < len; ++j) { + dest_buf[dest_index++] = pString[j] >> 8; + dest_buf[dest_index++] = static_cast<uint8_t>(pString[j]); + } } result.ReleaseBuffer(encLen); return result; |