From 0d32b8fda53e02c1036d39f7290d4f59f2b58ca4 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 16 Apr 2018 21:09:57 +0000 Subject: Revert "Return pdfium::span from WideString::GetBuffer()." This reverts commit 154e18f9a862975abecebe77b8f5fb418418d14c. Reason for revert: Generate CL to merge to beta branch Original change's description: > Return pdfium::span from WideString::GetBuffer(). > > Adds bounds checking "for free", but beware of span outliving > a ReleaseBuffer() call. Scoping as such avoids the possibility > of using an invalid span (and it is flagged as a lifetime issue). > > Change-Id: Ica63f4b1429823d0254ec6951aeaeb08160cb93c > Reviewed-on: https://pdfium-review.googlesource.com/30310 > Reviewed-by: dsinclair > Commit-Queue: Tom Sepez TBR=tsepez@chromium.org,dsinclair@chromium.org # Not skipping CQ checks because original CL landed > 1 day ago. Change-Id: Ie1ec9434215584a024538ca8edeb59dea555af48 Reviewed-on: https://pdfium-review.googlesource.com/30830 Reviewed-by: Tom Sepez Reviewed-by: dsinclair Commit-Queue: Tom Sepez --- core/fxcrt/widestring_unittest.cpp | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'core/fxcrt/widestring_unittest.cpp') diff --git a/core/fxcrt/widestring_unittest.cpp b/core/fxcrt/widestring_unittest.cpp index ec0a55fc1e..48d5c7f8f5 100644 --- a/core/fxcrt/widestring_unittest.cpp +++ b/core/fxcrt/widestring_unittest.cpp @@ -817,21 +817,20 @@ TEST(WideString, Reserve) { } TEST(WideString, GetBuffer) { - WideString str1; { - pdfium::span buffer = str1.GetBuffer(12); - wcscpy(buffer.data(), L"clams"); + WideString str; + wchar_t* buffer = str.GetBuffer(12); + wcscpy(buffer, L"clams"); + str.ReleaseBuffer(str.GetStringLength()); + EXPECT_EQ(L"clams", str); } - str1.ReleaseBuffer(str1.GetStringLength()); - EXPECT_EQ(L"clams", str1); - - WideString str2(L"cl"); { - pdfium::span buffer = str2.GetBuffer(12); - wcscpy(buffer.data() + 2, L"ams"); + WideString str(L"cl"); + wchar_t* buffer = str.GetBuffer(12); + wcscpy(buffer + 2, L"ams"); + str.ReleaseBuffer(str.GetStringLength()); + EXPECT_EQ(L"clams", str); } - str2.ReleaseBuffer(str2.GetStringLength()); - EXPECT_EQ(L"clams", str2); } TEST(WideString, ReleaseBuffer) { -- cgit v1.2.3