Return unique_ptr from CFX_BinaryBuf::DetachBuffer()

core/fxcrt/fx_basic_buffer.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include <algorithm>
 #include <limits>
+#include <memory>
+#include <utility>
 
 #include "core/fxcrt/fx_basic.h"
 #include "core/fxcrt/fx_safe_types.h"
 #include "third_party/base/numerics/safe_conversions.h"
 
 CFX_BinaryBuf::CFX_BinaryBuf()
     : m_AllocStep(0), m_AllocSize(0), m_DataSize(0) {}
 
 CFX_BinaryBuf::CFX_BinaryBuf(FX_STRSIZE size)
     : m_AllocStep(0), m_AllocSize(size), m_DataSize(size) {
@@ skipping 10 matching lines @@
   FXSYS_memmove(m_pBuffer.get() + start_index,
                 m_pBuffer.get() + start_index + count,
                 m_DataSize - start_index - count);
   m_DataSize -= count;
 }
 
 void CFX_BinaryBuf::Clear() {
   m_DataSize = 0;
 }
 
-uint8_t* CFX_BinaryBuf::DetachBuffer() {
+std::unique_ptr<uint8_t, FxFreeDeleter> CFX_BinaryBuf::DetachBuffer() {
   m_DataSize = 0;
   m_AllocSize = 0;
-  return m_pBuffer.release();
+  return std::move(m_pBuffer);
 }
 
 void CFX_BinaryBuf::EstimateSize(FX_STRSIZE size, FX_STRSIZE step) {
   m_AllocStep = step;
   if (m_AllocSize < size)
     ExpandBuf(size - m_DataSize);
 }
 
 void CFX_BinaryBuf::ExpandBuf(FX_STRSIZE add_size) {
   FX_SAFE_STRSIZE new_size = m_DataSize;
@@ skipping 224 matching lines @@
 
 int32_t CFX_FileBufferArchive::AppendString(const CFX_ByteStringC& lpsz) {
   return AppendBlock(lpsz.raw_str(), lpsz.GetLength());
 }
 
 void CFX_FileBufferArchive::AttachFile(
     const CFX_RetainPtr<IFX_WriteStream>& pFile) {
   ASSERT(pFile);
   m_pFile = pFile;
 }