Return unique_ptr from CFX_BinaryBuf::DetachBuffer()

core/fpdfapi/page/cpdf_streamparser.cpp

 // Copyright 2016 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 "core/fpdfapi/page/cpdf_streamparser.h"
 
 #include <limits.h>
 
@@ skipping 160 matching lines @@
   } else {
     if (width > INT_MAX - 7)
       return nullptr;
 
     OrigSize = ((width + 7) / 8);
   }
   if (height && OrigSize > INT_MAX / height)
     return nullptr;
 
   OrigSize *= height;
-  uint8_t* pData = nullptr;
+  std::unique_ptr<uint8_t, FxFreeDeleter> pData;
   uint32_t dwStreamSize;
   if (Decoder.IsEmpty()) {
     if (OrigSize > m_Size - m_Pos)
       OrigSize = m_Size - m_Pos;
-    pData = FX_Alloc(uint8_t, OrigSize);
-    FXSYS_memcpy(pData, m_pBuf + m_Pos, OrigSize);
+    pData.reset(FX_Alloc(uint8_t, OrigSize));
+    FXSYS_memcpy(pData.get(), m_pBuf + m_Pos, OrigSize);
     dwStreamSize = OrigSize;
     m_Pos += OrigSize;
   } else {
+    uint8_t* pIgnore;
     uint32_t dwDestSize = OrigSize;
     dwStreamSize =
         PDF_DecodeInlineStream(m_pBuf + m_Pos, m_Size - m_Pos, width, height,
-                               Decoder, pParam, pData, dwDestSize);
-    FX_Free(pData);
+                               Decoder, pParam, pIgnore, dwDestSize);
+    FX_Free(pIgnore);
     if (static_cast<int>(dwStreamSize) < 0)
       return nullptr;
 
     uint32_t dwSavePos = m_Pos;
     m_Pos += dwStreamSize;
     while (1) {
       uint32_t dwPrevPos = m_Pos;
       CPDF_StreamParser::SyntaxType type = ParseNextElement();
       if (type == CPDF_StreamParser::EndOfData)
         break;
 
       if (type != CPDF_StreamParser::Keyword) {
         dwStreamSize += m_Pos - dwPrevPos;
         continue;
       }
       if (GetWordSize() == 2 && GetWordBuf()[0] == 'E' &&
           GetWordBuf()[1] == 'I') {
         m_Pos = dwPrevPos;
         break;
       }
       dwStreamSize += m_Pos - dwPrevPos;
     }
     m_Pos = dwSavePos;
-    pData = FX_Alloc(uint8_t, dwStreamSize);
-    FXSYS_memcpy(pData, m_pBuf + m_Pos, dwStreamSize);
+    pData.reset(FX_Alloc(uint8_t, dwStreamSize));
+    FXSYS_memcpy(pData.get(), m_pBuf + m_Pos, dwStreamSize);
     m_Pos += dwStreamSize;
   }
   pDict->SetNewFor<CPDF_Number>("Length", (int)dwStreamSize);
-  return pdfium::MakeUnique<CPDF_Stream>(pData, dwStreamSize, std::move(pDict));
+  return pdfium::MakeUnique<CPDF_Stream>(std::move(pData), dwStreamSize,
+                                         std::move(pDict));
 }
 
 CPDF_StreamParser::SyntaxType CPDF_StreamParser::ParseNextElement() {
   m_pLastObj.reset();
   m_WordSize = 0;
   if (!PositionIsInBounds())
     return EndOfData;
 
   int ch = m_pBuf[m_Pos++];
   while (1) {
@@ skipping 360 matching lines @@
 
   if (buf.GetLength() > kMaxStringLength)
     return CFX_ByteString(buf.GetBuffer(), kMaxStringLength);
 
   return buf.MakeString();
 }
 
 bool CPDF_StreamParser::PositionIsInBounds() const {
   return m_Pos < m_Size;
 }