Refcount IFGAS_ streams all the time, too

xfa/fgas/crt/fgas_stream.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 "xfa/fgas/crt/fgas_stream.h"
 
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN32_MOBILE_ || \
     _FX_OS_ == _FX_WIN64_
@@ skipping 190 matching lines @@
   bool LoadBuffer(uint8_t* pData, int32_t iTotalSize, uint32_t dwAccess);
   bool LoadFileRead(const CFX_RetainPtr<IFX_SeekableReadStream>& pFileRead,
                     uint32_t dwAccess);
   bool LoadFileWrite(const CFX_RetainPtr<IFX_SeekableWriteStream>& pFileWrite,
                      uint32_t dwAccess);
   bool LoadBufferRead(const CFX_RetainPtr<IFX_BufferedReadStream>& pBufferRead,
                       int32_t iFileSize,
                       uint32_t dwAccess);
 
   // IFGAS_Stream
-  void Release() override;
-  IFGAS_Stream* Retain() override;
   uint32_t GetAccessModes() const override;
   int32_t GetLength() const override;
   int32_t Seek(FX_STREAMSEEK eSeek, int32_t iOffset) override;
   int32_t GetPosition() override;
   bool IsEOF() const override;
   int32_t ReadData(uint8_t* pBuffer, int32_t iBufferSize) override;
   int32_t ReadString(FX_WCHAR* pStr, int32_t iMaxLength, bool& bEOS) override;
   int32_t WriteData(const uint8_t* pBuffer, int32_t iBufferSize) override;
   int32_t WriteString(const FX_WCHAR* pStr, int32_t iLength) override;
   void Flush() override;
   bool SetLength(int32_t iLength) override;
   int32_t GetBOM(uint8_t bom[4]) const override;
   uint16_t GetCodePage() const override;
   uint16_t SetCodePage(uint16_t wCodePage) override;
-  IFGAS_Stream* CreateSharedStream(uint32_t dwAccess,
-                                   int32_t iOffset,
-                                   int32_t iLength) override;
+  CFX_RetainPtr<IFGAS_Stream> CreateSharedStream(uint32_t dwAccess,
+                                                 int32_t iOffset,
+                                                 int32_t iLength) override;
 
  protected:
   FX_STREAMTYPE m_eStreamType;
   IFGAS_StreamImp* m_pStreamImp;
   uint32_t m_dwAccess;
   int32_t m_iTotalSize;
   int32_t m_iPosition;
   int32_t m_iStart;
   int32_t m_iLength;
   int32_t m_iRefCount;
 };
 
 class CFGAS_TextStream : public IFGAS_Stream {
  public:
-  CFGAS_TextStream(IFGAS_Stream* pStream, bool bDelStream);
+  explicit CFGAS_TextStream(const CFX_RetainPtr<IFGAS_Stream>& pStream);
   ~CFGAS_TextStream() override;
 
   // IFGAS_Stream
-  void Release() override;
-  IFGAS_Stream* Retain() override;
   uint32_t GetAccessModes() const override;
   int32_t GetLength() const override;
   int32_t Seek(FX_STREAMSEEK eSeek, int32_t iOffset) override;
   int32_t GetPosition() override;
   bool IsEOF() const override;
   int32_t ReadData(uint8_t* pBuffer, int32_t iBufferSize) override;
   int32_t ReadString(FX_WCHAR* pStr, int32_t iMaxLength, bool& bEOS) override;
   int32_t WriteData(const uint8_t* pBuffer, int32_t iBufferSize) override;
   int32_t WriteString(const FX_WCHAR* pStr, int32_t iLength) override;
   void Flush() override;
   bool SetLength(int32_t iLength) override;
   int32_t GetBOM(uint8_t bom[4]) const override;
   uint16_t GetCodePage() const override;
   uint16_t SetCodePage(uint16_t wCodePage) override;
-  IFGAS_Stream* CreateSharedStream(uint32_t dwAccess,
-                                   int32_t iOffset,
-                                   int32_t iLength) override;
+  CFX_RetainPtr<IFGAS_Stream> CreateSharedStream(uint32_t dwAccess,
+                                                 int32_t iOffset,
+                                                 int32_t iLength) override;
 
  protected:
+  void InitStream();
+
   uint16_t m_wCodePage;
   int32_t m_wBOMLength;
   uint32_t m_dwBOM;
   uint8_t* m_pBuf;
   int32_t m_iBufSize;
-  bool m_bDelStream;
-  IFGAS_Stream* m_pStreamImp;
-  int32_t m_iRefCount;
-  void InitStream();
+  CFX_RetainPtr<IFGAS_Stream> m_pStreamImp;
 };
 
 class CFGAS_FileRead : public IFX_SeekableReadStream {
  public:
-  static CFX_RetainPtr<CFGAS_FileRead> Create(IFGAS_Stream* pStream,
-                                              bool bReleaseStream);
+  static CFX_RetainPtr<CFGAS_FileRead> Create(
+      const CFX_RetainPtr<IFGAS_Stream>& pStream);
+
+  explicit CFGAS_FileRead(const CFX_RetainPtr<IFGAS_Stream>& pStream);
   ~CFGAS_FileRead() override;
 
   // IFX_SeekableReadStream
   FX_FILESIZE GetSize() override;
   bool ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) override;
 
  protected:
-  CFGAS_FileRead(IFGAS_Stream* pStream, bool bReleaseStream);
-
-  bool m_bReleaseStream;
-  IFGAS_Stream* m_pStream;
+  CFX_RetainPtr<IFGAS_Stream> m_pStream;
 };
 
 int32_t FileLength(FXSYS_FILE* file) {
   ASSERT(file);
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_
   return _filelength(_fileno(file));
 #else
   int32_t iPos = FXSYS_ftell(file);
   FXSYS_fseek(file, 0, FXSYS_SEEK_END);
   int32_t iLen = FXSYS_ftell(file);
@@ skipping 14 matching lines @@
   ::SetFilePointer(hFile, (int32_t)dwPos, 0, FILE_BEGIN);
   return bRet;
 #else
   return false;
 #endif
 }
 
 }  // namespace
 
 // static
-IFGAS_Stream* IFGAS_Stream::CreateStream(
+CFX_RetainPtr<IFGAS_Stream> IFGAS_Stream::CreateStream(
     const CFX_RetainPtr<IFX_SeekableReadStream>& pFileRead,
     uint32_t dwAccess) {
-  CFGAS_Stream* pSR = new CFGAS_Stream;
-  if (!pSR->LoadFileRead(pFileRead, dwAccess)) {
-    pSR->Release();
+  auto pSR = pdfium::MakeRetain<CFGAS_Stream>();
+  if (!pSR->LoadFileRead(pFileRead, dwAccess))
     return nullptr;
-  }
+
   if (dwAccess & FX_STREAMACCESS_Text)
-    return new CFGAS_TextStream(pSR, true);
+    return pdfium::MakeRetain<CFGAS_TextStream>(pSR);
 
   return pSR;
 }
 
 // static
-IFGAS_Stream* IFGAS_Stream::CreateStream(
+CFX_RetainPtr<IFGAS_Stream> IFGAS_Stream::CreateStream(
     const CFX_RetainPtr<IFX_SeekableWriteStream>& pFileWrite,
     uint32_t dwAccess) {
-  CFGAS_Stream* pSR = new CFGAS_Stream;
-  if (!pSR->LoadFileWrite(pFileWrite, dwAccess)) {
-    pSR->Release();
+  auto pSR = pdfium::MakeRetain<CFGAS_Stream>();
+  if (!pSR->LoadFileWrite(pFileWrite, dwAccess))
     return nullptr;
-  }
+
   if (dwAccess & FX_STREAMACCESS_Text)
-    return new CFGAS_TextStream(pSR, true);
+    return pdfium::MakeRetain<CFGAS_TextStream>(pSR);
 
   return pSR;
 }
 
 // static
-IFGAS_Stream* IFGAS_Stream::CreateStream(uint8_t* pData,
-                                         int32_t length,
-                                         uint32_t dwAccess) {
-  CFGAS_Stream* pSR = new CFGAS_Stream;
-  if (!pSR->LoadBuffer(pData, length, dwAccess)) {
-    pSR->Release();
+CFX_RetainPtr<IFGAS_Stream> IFGAS_Stream::CreateStream(uint8_t* pData,
+                                                       int32_t length,
+                                                       uint32_t dwAccess) {
+  auto pSR = pdfium::MakeRetain<CFGAS_Stream>();
+  if (!pSR->LoadBuffer(pData, length, dwAccess))
     return nullptr;
-  }
+
   if (dwAccess & FX_STREAMACCESS_Text)
-    return new CFGAS_TextStream(pSR, true);
+    return pdfium::MakeRetain<CFGAS_TextStream>(pSR);
 
   return pSR;
 }
 
 IFGAS_StreamImp::IFGAS_StreamImp() : m_dwAccess(0) {}
 
 CFGAS_FileStreamImp::CFGAS_FileStreamImp() : m_hFile(nullptr), m_iLength(0) {}
 
 CFGAS_FileStreamImp::~CFGAS_FileStreamImp() {
   if (m_hFile)
@@ skipping 519 matching lines @@
   }
   FXSYS_memcpy(m_pData + m_iPosition, pStr, iLen * 2);
   m_iPosition += iLen * 2;
   if (m_iPosition > m_iLength) {
     m_iLength = m_iPosition;
   }
   return iLen;
 }
 
 // static
-IFGAS_Stream* IFGAS_Stream::CreateTextStream(IFGAS_Stream* pBaseStream,
-                                             bool bDeleteOnRelease) {
+CFX_RetainPtr<IFGAS_Stream> IFGAS_Stream::CreateTextStream(
+    const CFX_RetainPtr<IFGAS_Stream>& pBaseStream) {
   ASSERT(pBaseStream);
-  return new CFGAS_TextStream(pBaseStream, bDeleteOnRelease);
+  return pdfium::MakeRetain<CFGAS_TextStream>(pBaseStream);
 }
 
-CFGAS_TextStream::CFGAS_TextStream(IFGAS_Stream* pStream, bool bDelStream)
+CFGAS_TextStream::CFGAS_TextStream(const CFX_RetainPtr<IFGAS_Stream>& pStream)
     : m_wCodePage(FX_CODEPAGE_DefANSI),
       m_wBOMLength(0),
       m_dwBOM(0),
       m_pBuf(nullptr),
       m_iBufSize(0),
-      m_bDelStream(bDelStream),
-      m_pStreamImp(pStream),
-      m_iRefCount(1) {
+      m_pStreamImp(pStream) {
   ASSERT(m_pStreamImp);
-  m_pStreamImp->Retain();
   InitStream();
 }
 
 CFGAS_TextStream::~CFGAS_TextStream() {
-  m_pStreamImp->Release();
-  if (m_bDelStream)
-    m_pStreamImp->Release();
   if (m_pBuf)
     FX_Free(m_pBuf);
 }
 
 void CFGAS_TextStream::InitStream() {
   int32_t iPosition = m_pStreamImp->GetPosition();
   m_pStreamImp->Seek(FX_STREAMSEEK_Begin, 0);
   m_pStreamImp->ReadData((uint8_t*)&m_dwBOM, 3);
 #if _FX_ENDIAN_ == _FX_LITTLE_ENDIAN_
   m_dwBOM &= 0x00FFFFFF;
@@ skipping 30 matching lines @@
     } else {
       m_wBOMLength = 0;
       m_dwBOM = 0;
       m_wCodePage = FXSYS_GetACP();
     }
   }
 #endif
   m_pStreamImp->Seek(FX_STREAMSEEK_Begin, std::max(m_wBOMLength, iPosition));
 }
 
-void CFGAS_TextStream::Release() {
-  if (--m_iRefCount < 1)
-    delete this;
-}
-
-IFGAS_Stream* CFGAS_TextStream::Retain() {
-  m_iRefCount++;
-  return this;
-}
-
 uint32_t CFGAS_TextStream::GetAccessModes() const {
   return m_pStreamImp->GetAccessModes() | FX_STREAMACCESS_Text;
 }
 
 int32_t CFGAS_TextStream::GetLength() const {
   return m_pStreamImp->GetLength();
 }
 
 int32_t CFGAS_TextStream::Seek(FX_STREAMSEEK eSeek, int32_t iOffset) {
   return m_pStreamImp->Seek(eSeek, iOffset);
@@ skipping 21 matching lines @@
 }
 
 bool CFGAS_TextStream::SetLength(int32_t iLength) {
   return m_pStreamImp->SetLength(iLength);
 }
 
 uint16_t CFGAS_TextStream::GetCodePage() const {
   return m_wCodePage;
 }
 
-IFGAS_Stream* CFGAS_TextStream::CreateSharedStream(uint32_t dwAccess,
-                                                   int32_t iOffset,
-                                                   int32_t iLength) {
-  IFGAS_Stream* pSR =
+CFX_RetainPtr<IFGAS_Stream> CFGAS_TextStream::CreateSharedStream(
+    uint32_t dwAccess,
+    int32_t iOffset,
+    int32_t iLength) {
+  CFX_RetainPtr<IFGAS_Stream> pSR =
       m_pStreamImp->CreateSharedStream(dwAccess, iOffset, iLength);
   if (!pSR)
     return nullptr;
 
   if (dwAccess & FX_STREAMACCESS_Text)
-    return new CFGAS_TextStream(pSR, true);
+    return pdfium::MakeRetain<CFGAS_TextStream>(pSR);
 
   return pSR;
 }
 
 int32_t CFGAS_TextStream::GetBOM(uint8_t bom[4]) const {
   if (m_wBOMLength < 1)
     return 0;
 
   *(uint32_t*)bom = m_dwBOM;
   return m_wBOMLength;
@@ skipping 186 matching lines @@
   if (!pImp->LoadBufferRead(pBufferRead, iFileSize, dwAccess))
     return false;
 
   m_pStreamImp = pImp.release();
   m_eStreamType = FX_STREAMTYPE_BufferRead;
   m_dwAccess = dwAccess;
   m_iLength = m_pStreamImp->GetLength();
   return true;
 }
 
-void CFGAS_Stream::Release() {
-  if (--m_iRefCount < 1) {
-    delete this;
-  }
-}
-IFGAS_Stream* CFGAS_Stream::Retain() {
-  m_iRefCount++;
-  return this;
-}
-
 uint32_t CFGAS_Stream::GetAccessModes() const {
   return m_dwAccess;
 }
 
 int32_t CFGAS_Stream::GetLength() const {
   if (!m_pStreamImp) {
     return -1;
   }
   if (m_eStreamType == FX_STREAMTYPE_File ||
       m_eStreamType == FX_STREAMTYPE_Buffer) {
@@ skipping 169 matching lines @@
   return FX_CODEPAGE_UTF16BE;
 #endif
 }
 uint16_t CFGAS_Stream::SetCodePage(uint16_t wCodePage) {
 #if _FX_ENDIAN_ == _FX_LITTLE_ENDIAN_
   return FX_CODEPAGE_UTF16LE;
 #else
   return FX_CODEPAGE_UTF16BE;
 #endif
 }
-IFGAS_Stream* CFGAS_Stream::CreateSharedStream(uint32_t dwAccess,
-                                               int32_t iOffset,
-                                               int32_t iLength) {
+
+CFX_RetainPtr<IFGAS_Stream> CFGAS_Stream::CreateSharedStream(uint32_t dwAccess,
+                                                             int32_t iOffset,
+                                                             int32_t iLength) {
   ASSERT(iLength > 0);
   if (!m_pStreamImp)
     return nullptr;
 
   if ((m_dwAccess & FX_STREAMACCESS_Text) != 0 &&
       (dwAccess & FX_STREAMACCESS_Text) == 0) {
     return nullptr;
   }
   if ((m_dwAccess & FX_STREAMACCESS_Write) == 0 &&
       (dwAccess & FX_STREAMACCESS_Write) != 0) {
     return nullptr;
   }
   int32_t iStart = m_iStart + iOffset;
   int32_t iTotal = m_iStart + m_iLength;
   if (iStart < m_iStart || iStart >= iTotal)
     return nullptr;
 
   int32_t iEnd = iStart + iLength;
   if (iEnd < iStart || iEnd > iTotal)
     return nullptr;
 
-  CFGAS_Stream* pShared = new CFGAS_Stream;
+  auto pShared = pdfium::MakeRetain<CFGAS_Stream>();
   pShared->m_eStreamType = FX_STREAMTYPE_Stream;
   pShared->m_pStreamImp = m_pStreamImp;
   pShared->m_dwAccess = dwAccess;
   pShared->m_iTotalSize = iLength;
   pShared->m_iPosition = iStart;
   pShared->m_iStart = iStart;
   pShared->m_iLength = (dwAccess & FX_STREAMACCESS_Write) != 0 ? 0 : iLength;
   if (dwAccess & FX_STREAMACCESS_Text)
-    return IFGAS_Stream::CreateTextStream(pShared, true);
+    return IFGAS_Stream::CreateTextStream(pShared);
 
   return pShared;
 }
 
 CFX_RetainPtr<IFX_SeekableReadStream> IFGAS_Stream::MakeSeekableReadStream() {
-  return CFGAS_FileRead::Create(this, false);
+  return CFGAS_FileRead::Create(CFX_RetainPtr<IFGAS_Stream>(this));
 }
 
-CFX_RetainPtr<CFGAS_FileRead> CFGAS_FileRead::Create(IFGAS_Stream* pStream,
-                                                     bool bReleaseStream) {
-  return CFX_RetainPtr<CFGAS_FileRead>(
-      new CFGAS_FileRead(pStream, bReleaseStream));
+CFX_RetainPtr<CFGAS_FileRead> CFGAS_FileRead::Create(
+    const CFX_RetainPtr<IFGAS_Stream>& pStream) {
+  return pdfium::MakeRetain<CFGAS_FileRead>(pStream);
 }
 
-CFGAS_FileRead::CFGAS_FileRead(IFGAS_Stream* pStream, bool bReleaseStream)
-    : m_bReleaseStream(bReleaseStream), m_pStream(pStream) {
+CFGAS_FileRead::CFGAS_FileRead(const CFX_RetainPtr<IFGAS_Stream>& pStream)
+    : m_pStream(pStream) {
   ASSERT(m_pStream);
 }
 
-CFGAS_FileRead::~CFGAS_FileRead() {
-  if (m_bReleaseStream) {
-    m_pStream->Release();
-  }
-}
+CFGAS_FileRead::~CFGAS_FileRead() {}
+
 FX_FILESIZE CFGAS_FileRead::GetSize() {
   return (FX_FILESIZE)m_pStream->GetLength();
 }
 
 bool CFGAS_FileRead::ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) {
   m_pStream->Seek(FX_STREAMSEEK_Begin, (int32_t)offset);
   int32_t iLen = m_pStream->ReadData((uint8_t*)buffer, (int32_t)size);
   return iLen == (int32_t)size;
 }