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 --- core/fxcrt/bytestring_unittest.cpp | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'core/fxcrt/bytestring_unittest.cpp') diff --git a/core/fxcrt/bytestring_unittest.cpp b/core/fxcrt/bytestring_unittest.cpp index 74e52db69a..8dab4f0cba 100644 --- a/core/fxcrt/bytestring_unittest.cpp +++ b/core/fxcrt/bytestring_unittest.cpp @@ -839,22 +839,23 @@ TEST(ByteString, Reserve) { } TEST(ByteString, GetBuffer) { + ByteString str1; { - ByteString str; - char* buffer = str.GetBuffer(12); + pdfium::span buffer = str1.GetBuffer(12); // NOLINTNEXTLINE(runtime/printf) - strcpy(buffer, "clams"); - str.ReleaseBuffer(str.GetStringLength()); - EXPECT_EQ("clams", str); + strcpy(buffer.data(), "clams"); } + str1.ReleaseBuffer(str1.GetStringLength()); + EXPECT_EQ("clams", str1); + + ByteString str2("cl"); { - ByteString str("cl"); - char* buffer = str.GetBuffer(12); + pdfium::span buffer = str2.GetBuffer(12); // NOLINTNEXTLINE(runtime/printf) - strcpy(buffer + 2, "ams"); - str.ReleaseBuffer(str.GetStringLength()); - EXPECT_EQ("clams", str); + strcpy(&buffer[2], "ams"); } + str2.ReleaseBuffer(str2.GetStringLength()); + EXPECT_EQ("clams", str2); } TEST(ByteString, ReleaseBuffer) { -- cgit v1.2.3