1 files changed, 12 insertions, 8 deletions
diff --git a/core/fxcrt/xml/cfx_saxreader.h b/core/fxcrt/xml/cfx_saxreader.h
index 45f0d07084..47ef79c50f 100644
--- a/core/fxcrt/xml/cfx_saxreader.h
+++ b/core/fxcrt/xml/cfx_saxreader.h
@@ -9,6 +9,7 @@
 
 #include <memory>
 #include <stack>
+#include <vector>
 
 #include "core/fxcrt/fx_basic.h"
 
@@ -124,6 +125,14 @@ class CFX_SAXReader {
   void ParseTagEnd();
   void ParseTargetData();
   void Reset();
+  void ClearData();
+  void ClearName();
+  void AppendToData(uint8_t ch);
+  void AppendToName(uint8_t ch);
+  void BackUpAndReplaceDataAt(int32_t index, uint8_t ch);
+  bool IsEntityStart(uint8_t ch) const;
+  bool IsEntityEnd(uint8_t ch) const;
+  int32_t CurrentDataIndex() const;
   void Push();
   void Pop();
   CFX_SAXItem* GetCurrentItem() const;
@@ -153,14 +162,9 @@ class CFX_SAXReader {
   std::stack<char> m_SkipStack;
   uint8_t m_SkipChar;
   uint32_t m_dwNodePos;
-  uint8_t* m_pszData;
-  int32_t m_iDataSize;
-  int32_t m_iDataLength;
-  int32_t m_iEntityStart;
-  int32_t m_iDataPos;
-  uint8_t* m_pszName;
-  int32_t m_iNameSize;
-  int32_t m_iNameLength;
+  std::vector<uint8_t> m_Data;
+  int32_t m_iEntityStart;  // Index into m_Data.
+  std::vector<uint8_t> m_Name;
   uint32_t m_dwParseMode;
   std::unique_ptr<CFX_SAXCommentContext> m_pCommentContext;
 };