Refcount all the IFX_ stream classes all the time.

core/fxcrt/fx_xml_parser.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 "core/fxcrt/xml_int.h"
 
 #include <algorithm>
 #include <vector>
@@ skipping 56 matching lines @@
 bool g_FXCRT_XML_IsNameChar(uint8_t ch) {
   return !!(g_FXCRT_XML_ByteTypes[ch] & FXCRTM_XML_CHARTYPE_NameChar);
 }
 
 class CXML_DataBufAcc : public IFX_BufferedReadStream {
  public:
   CXML_DataBufAcc(const uint8_t* pBuffer, size_t size);
   ~CXML_DataBufAcc() override;
 
   // IFX_BufferedReadStream
-  void Release() override;
   bool IsEOF() override;
   FX_FILESIZE GetPosition() override;
   size_t ReadBlock(void* buffer, size_t size) override;
   bool ReadNextBlock(bool bRestart) override;
   const uint8_t* GetBlockBuffer() override;
   size_t GetBlockSize() override;
   FX_FILESIZE GetBlockOffset() override;
 
  private:
   const uint8_t* m_pBuffer;
   size_t m_dwSize;
   size_t m_dwCurPos;
 };
 
 CXML_DataBufAcc::CXML_DataBufAcc(const uint8_t* pBuffer, size_t size)
     : m_pBuffer(pBuffer), m_dwSize(size), m_dwCurPos(0) {}
 
 CXML_DataBufAcc::~CXML_DataBufAcc() {}
 
-void CXML_DataBufAcc::Release() {
-  delete this;
-}
-
 bool CXML_DataBufAcc::IsEOF() {
   return m_dwCurPos >= m_dwSize;
 }
 
 FX_FILESIZE CXML_DataBufAcc::GetPosition() {
   return (FX_FILESIZE)m_dwCurPos;
 }
 
 size_t CXML_DataBufAcc::ReadBlock(void* buffer, size_t size) {
   return 0;
@@ skipping 17 matching lines @@
 size_t CXML_DataBufAcc::GetBlockSize() {
   return m_dwSize;
 }
 
 FX_FILESIZE CXML_DataBufAcc::GetBlockOffset() {
   return 0;
 }
 
 class CXML_DataStmAcc : public IFX_BufferedReadStream {
  public:
-  explicit CXML_DataStmAcc(IFX_SeekableReadStream* pFileRead);
+  explicit CXML_DataStmAcc(
+      const CFX_RetainPtr<IFX_SeekableReadStream>& pFileRead);
   ~CXML_DataStmAcc() override;
 
   // IFX_BufferedReadStream
-  void Release() override;
   bool IsEOF() override;
   FX_FILESIZE GetPosition() override;
   size_t ReadBlock(void* buffer, size_t size) override;
   bool ReadNextBlock(bool bRestart) override;
   const uint8_t* GetBlockBuffer() override;
   size_t GetBlockSize() override;
   FX_FILESIZE GetBlockOffset() override;
 
  private:
-  IFX_SeekableReadStream* m_pFileRead;
+  CFX_RetainPtr<IFX_SeekableReadStream> m_pFileRead;
   uint8_t* m_pBuffer;
   FX_FILESIZE m_nStart;
   size_t m_dwSize;
 };
 
-CXML_DataStmAcc::CXML_DataStmAcc(IFX_SeekableReadStream* pFileRead)
+CXML_DataStmAcc::CXML_DataStmAcc(
+    const CFX_RetainPtr<IFX_SeekableReadStream>& pFileRead)
     : m_pFileRead(pFileRead), m_pBuffer(nullptr), m_nStart(0), m_dwSize(0) {
   ASSERT(m_pFileRead);
 }
 
 CXML_DataStmAcc::~CXML_DataStmAcc() {
   FX_Free(m_pBuffer);
 }
 
-void CXML_DataStmAcc::Release() {
-  delete this;
-}
-
 bool CXML_DataStmAcc::IsEOF() {
   return m_nStart + (FX_FILESIZE)m_dwSize >= m_pFileRead->GetSize();
 }
 
 FX_FILESIZE CXML_DataStmAcc::GetPosition() {
   return m_nStart + (FX_FILESIZE)m_dwSize;
 }
 
 size_t CXML_DataStmAcc::ReadBlock(void* buffer, size_t size) {
   return 0;
@@ skipping 25 matching lines @@
   return m_dwSize;
 }
 
 FX_FILESIZE CXML_DataStmAcc::GetBlockOffset() {
   return m_nStart;
 }
 
 }  // namespace
 
 CXML_Parser::CXML_Parser()
-    : m_pDataAcc(nullptr),
-      m_bOwnedStream(false),
-      m_nOffset(0),
+    : m_nOffset(0),
       m_bSaveSpaceChars(false),
       m_pBuffer(nullptr),
       m_dwBufferSize(0),
       m_nBufferOffset(0),
       m_dwIndex(0) {}
 
-CXML_Parser::~CXML_Parser() {
-  if (m_bOwnedStream) {
-    m_pDataAcc->Release();
-  }
+CXML_Parser::~CXML_Parser() {}
+
+bool CXML_Parser::Init(uint8_t* pBuffer, size_t size) {
+  m_pDataAcc.Reset(new CXML_DataBufAcc(pBuffer, size));
+  return Init();
 }
 
-bool CXML_Parser::Init(uint8_t* pBuffer, size_t size) {
-  m_pDataAcc = new CXML_DataBufAcc(pBuffer, size);
-  return Init(true);
+bool CXML_Parser::Init(const CFX_RetainPtr<IFX_SeekableReadStream>& pFileRead) {
+  m_pDataAcc.Reset(new CXML_DataStmAcc(pFileRead));
+  return Init();
 }
 
-bool CXML_Parser::Init(IFX_SeekableReadStream* pFileRead) {
-  m_pDataAcc = new CXML_DataStmAcc(pFileRead);
-  return Init(true);
-}
-
-bool CXML_Parser::Init(IFX_BufferedReadStream* pBuffer) {
+bool CXML_Parser::Init(const CFX_RetainPtr<IFX_BufferedReadStream>& pBuffer) {
   if (!pBuffer)
     return false;
 
   m_pDataAcc = pBuffer;
-  return Init(false);
+  return Init();
 }
 
-bool CXML_Parser::Init(bool bOwndedStream) {
-  m_bOwnedStream = bOwndedStream;
+bool CXML_Parser::Init() {
   m_nOffset = 0;
   return ReadNextBlock();
 }
 
 bool CXML_Parser::ReadNextBlock() {
   if (!m_pDataAcc->ReadNextBlock())
     return false;
 
   m_pBuffer = m_pDataAcc->GetBlockBuffer();
   m_dwBufferSize = m_pDataAcc->GetBlockSize();
@@ skipping 433 matching lines @@
 CXML_Element* CXML_Element::Parse(const void* pBuffer,
                                   size_t size,
                                   bool bSaveSpaceChars,
                                   FX_FILESIZE* pParsedSize) {
   CXML_Parser parser;
   if (!parser.Init((uint8_t*)pBuffer, size)) {
     return nullptr;
   }
   return XML_ContinueParse(parser, bSaveSpaceChars, pParsedSize);
 }
-CXML_Element* CXML_Element::Parse(IFX_SeekableReadStream* pFile,
-                                  bool bSaveSpaceChars,
-                                  FX_FILESIZE* pParsedSize) {
+
+CXML_Element* CXML_Element::Parse(
+    const CFX_RetainPtr<IFX_SeekableReadStream>& pFile,
+    bool bSaveSpaceChars,
+    FX_FILESIZE* pParsedSize) {
   CXML_Parser parser;
-  if (!parser.Init(pFile)) {
+  if (!parser.Init(pFile))
     return nullptr;
-  }
+
   return XML_ContinueParse(parser, bSaveSpaceChars, pParsedSize);
 }
-CXML_Element* CXML_Element::Parse(IFX_BufferedReadStream* pBuffer,
-                                  bool bSaveSpaceChars,
-                                  FX_FILESIZE* pParsedSize) {
+
+CXML_Element* CXML_Element::Parse(
+    const CFX_RetainPtr<IFX_BufferedReadStream>& pBuffer,
+    bool bSaveSpaceChars,
+    FX_FILESIZE* pParsedSize) {
   CXML_Parser parser;
-  if (!parser.Init(pBuffer)) {
+  if (!parser.Init(pBuffer))
     return nullptr;
-  }
+
   return XML_ContinueParse(parser, bSaveSpaceChars, pParsedSize);
 }
+
 CXML_Element::CXML_Element() : m_QSpaceName(), m_TagName(), m_AttrMap() {}
 CXML_Element::CXML_Element(const CFX_ByteStringC& qSpace,
                            const CFX_ByteStringC& tagName)
     : m_QSpaceName(), m_TagName(), m_AttrMap() {
   m_QSpaceName = qSpace;
   m_TagName = tagName;
 }
 CXML_Element::CXML_Element(const CFX_ByteStringC& qTagName)
     : m_pParent(nullptr), m_QSpaceName(), m_TagName(), m_AttrMap() {
   SetTag(qTagName);
@@ skipping 225 matching lines @@
   m_pMap->push_back({space, name, CFX_WideString(value)});
 }
 
 int CXML_AttrMap::GetSize() const {
   return m_pMap ? pdfium::CollectionSize<int>(*m_pMap) : 0;
 }
 
 CXML_AttrItem& CXML_AttrMap::GetAt(int index) const {
   return (*m_pMap)[index];
 }