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 --- core/fxcrt/widestring.cpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'core/fxcrt/widestring.cpp') diff --git a/core/fxcrt/widestring.cpp b/core/fxcrt/widestring.cpp index a3525593ee..25f253ea11 100644 --- a/core/fxcrt/widestring.cpp +++ b/core/fxcrt/widestring.cpp @@ -667,18 +667,21 @@ ByteString WideString::UTF8Encode() const { } ByteString WideString::UTF16LE_Encode() const { - if (!m_pData) { + if (!m_pData) return ByteString("\0\0", 2); - } - int len = m_pData->m_nDataLength; + ByteString result; - char* buffer = result.GetBuffer(len * 2 + 2); - for (int i = 0; i < len; i++) { - buffer[i * 2] = m_pData->m_String[i] & 0xff; - buffer[i * 2 + 1] = m_pData->m_String[i] >> 8; + int len = m_pData->m_nDataLength; + { + // Span's lifetime must end before ReleaseBuffer() below. + pdfium::span buffer = result.GetBuffer(len * 2 + 2); + for (int i = 0; i < len; i++) { + buffer[i * 2] = m_pData->m_String[i] & 0xff; + buffer[i * 2 + 1] = m_pData->m_String[i] >> 8; + } + buffer[len * 2] = 0; + buffer[len * 2 + 1] = 0; } - buffer[len * 2] = 0; - buffer[len * 2 + 1] = 0; result.ReleaseBuffer(len * 2 + 2); return result; } -- cgit v1.2.3