3 files changed, 30 insertions, 20 deletions

diff --git a/core/fxcrt/xml/cfx_saxcontext.cpp b/core/fxcrt/xml/cfx_saxcontext.cpp
new file mode 100644
index 0000000000..4e2f0c58c9
--- /dev/null
+++ b/core/fxcrt/xml/cfx_saxcontext.cpp
@@ -0,0 +1,9 @@
+// Copyright 2017 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.
+
+#include "core/fxcrt/xml/cfx_saxcontext.h"
+
+CFX_SAXContext::CFX_SAXContext() : m_eNode(CFX_SAXItem::Type::Unknown) {}
+
+CFX_SAXContext::~CFX_SAXContext() {}
diff --git a/core/fxcrt/xml/cfx_saxcontext.h b/core/fxcrt/xml/cfx_saxcontext.h
index 7afebed98d..fcc889f7a3 100644
--- a/core/fxcrt/xml/cfx_saxcontext.h
+++ b/core/fxcrt/xml/cfx_saxcontext.h
@@ -7,15 +7,18 @@
 #ifndef CORE_FXCRT_XML_CFX_SAXCONTEXT_H_
 #define CORE_FXCRT_XML_CFX_SAXCONTEXT_H_
 
+#include <sstream>
+
 #include "core/fxcrt/fx_basic.h"
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/xml/cfx_saxreader.h"
 
 class CFX_SAXContext {
  public:
-  CFX_SAXContext() : m_eNode(CFX_SAXItem::Type::Unknown) {}
+  CFX_SAXContext();
+  ~CFX_SAXContext();
 
-  CFX_ByteTextBuf m_TextBuf;
+  std::ostringstream m_TextBuf;
   CFX_ByteString m_bsTagName;
   CFX_SAXItem::Type m_eNode;
 };
diff --git a/core/fxcrt/xml/cfx_saxreaderhandler.cpp b/core/fxcrt/xml/cfx_saxreaderhandler.cpp
index e7b6cd186c..9967f3eea8 100644
--- a/core/fxcrt/xml/cfx_saxreaderhandler.cpp
+++ b/core/fxcrt/xml/cfx_saxreaderhandler.cpp
@@ -26,12 +26,11 @@ CFX_SAXContext* CFX_SAXReaderHandler::OnTagEnter(
   }
 
   m_SAXContext.m_eNode = eType;
-  CFX_ByteTextBuf& textBuf = m_SAXContext.m_TextBuf;
-  textBuf << "<";
+  m_SAXContext.m_TextBuf << "<";
   if (eType == CFX_SAXItem::Type::Instruction)
-    textBuf << "?";
+    m_SAXContext.m_TextBuf << "?";
 
-  textBuf << bsTagName;
+  m_SAXContext.m_TextBuf << bsTagName.c_str();
   m_SAXContext.m_bsTagName = bsTagName;
   return &m_SAXContext;
 }
@@ -41,7 +40,7 @@ void CFX_SAXReaderHandler::OnTagAttribute(CFX_SAXContext* pTag,
                                           const CFX_ByteStringC& bsValue) {
   if (!pTag)
     return;
-  pTag->m_TextBuf << " " << bsAttri << "=\"" << bsValue << "\"";
+  pTag->m_TextBuf << " " << bsAttri.c_str() << "=\"" << bsValue.c_str() << "\"";
 }
 
 void CFX_SAXReaderHandler::OnTagBreak(CFX_SAXContext* pTag) {
@@ -59,24 +58,22 @@ void CFX_SAXReaderHandler::OnTagData(CFX_SAXContext* pTag,
   if (!pTag)
     return;
 
-  CFX_ByteTextBuf& textBuf = pTag->m_TextBuf;
   if (eType == CFX_SAXItem::Type::CharData)
-    textBuf << "<![CDATA[";
+    pTag->m_TextBuf << "<![CDATA[";
 
-  textBuf << bsData;
+  pTag->m_TextBuf << bsData.c_str();
   if (eType == CFX_SAXItem::Type::CharData)
-    textBuf << "]]>";
+    pTag->m_TextBuf << "]]>";
 }
 
 void CFX_SAXReaderHandler::OnTagClose(CFX_SAXContext* pTag, uint32_t dwEndPos) {
   if (!pTag)
     return;
 
-  CFX_ByteTextBuf& textBuf = pTag->m_TextBuf;
   if (pTag->m_eNode == CFX_SAXItem::Type::Instruction)
-    textBuf << "?>";
+    pTag->m_TextBuf << "?>";
   else if (pTag->m_eNode == CFX_SAXItem::Type::Tag)
-    textBuf << "></" << pTag->m_bsTagName.AsStringC() << ">";
+    pTag->m_TextBuf << "></" << pTag->m_bsTagName.AsStringC().c_str() << ">";
 
   UpdateChecksum(false);
 }
@@ -87,7 +84,7 @@ void CFX_SAXReaderHandler::OnTagEnd(CFX_SAXContext* pTag,
   if (!pTag)
     return;
 
-  pTag->m_TextBuf << "</" << bsTagName << ">";
+  pTag->m_TextBuf << "</" << bsTagName.c_str() << ">";
   UpdateChecksum(false);
 }
 
@@ -99,19 +96,20 @@ void CFX_SAXReaderHandler::OnTargetData(CFX_SAXContext* pTag,
     return;
 
   if (eType == CFX_SAXItem::Type::Comment) {
-    m_SAXContext.m_TextBuf << "<!--" << bsData << "-->";
+    m_SAXContext.m_TextBuf << "<!--" << bsData.c_str() << "-->";
     UpdateChecksum(false);
   } else {
-    pTag->m_TextBuf << " " << bsData;
+    pTag->m_TextBuf << " " << bsData.c_str();
   }
 }
 
 void CFX_SAXReaderHandler::UpdateChecksum(bool bCheckSpace) {
-  int32_t iLength = m_SAXContext.m_TextBuf.GetLength();
+  int32_t iLength = m_SAXContext.m_TextBuf.tellp();
   if (iLength < 1)
     return;
 
-  uint8_t* pBuffer = m_SAXContext.m_TextBuf.GetBuffer();
+  const uint8_t* pBuffer =
+      reinterpret_cast<const uint8_t*>(m_SAXContext.m_TextBuf.str().c_str());
   bool bUpdata = true;
   if (bCheckSpace) {
     bUpdata = false;
@@ -124,5 +122,5 @@ void CFX_SAXReaderHandler::UpdateChecksum(bool bCheckSpace) {
   if (bUpdata)
     m_pContext->Update(CFX_ByteStringC(pBuffer, iLength));
 
-  m_SAXContext.m_TextBuf.Clear();
+  m_SAXContext.m_TextBuf.str("");
 }