Fix leak in CPDF_StreamContentParser::AddTextObject().

core/fpdfapi/fpdf_page/include/cpdf_clippath.h

 // 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
 
 #ifndef CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_CLIPPATH_H_
 #define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_CLIPPATH_H_
 
 #include "core/fpdfapi/fpdf_page/cpdf_clippathdata.h"
 #include "core/fpdfapi/fpdf_page/include/cpdf_path.h"
 #include "core/fxcrt/include/fx_basic.h"
 #include "core/fxcrt/include/fx_coordinates.h"
 #include "core/fxcrt/include/fx_system.h"
 
 class CPDF_TextObject;
 
 class CPDF_ClipPath : public CFX_CountRef<CPDF_ClipPathData> {
  public:
-  uint32_t GetPathCount() const { return m_pObject->m_PathCount; }
-  CPDF_Path GetPath(int i) const { return m_pObject->m_pPathList[i]; }
-  int GetClipType(int i) const { return m_pObject->m_pTypeList[i]; }
-  uint32_t GetTextCount() const { return m_pObject->m_TextCount; }
-  CPDF_TextObject* GetText(int i) const { return m_pObject->m_pTextList[i]; }
+  uint32_t GetPathCount() const { return m_pObject->m_PathList.size(); }

[Tom Sepez, 2016/05/19 18:32:03]

pdfium::CollectionSize<uint32_t>() if we worry about overflow from maybe 64-bit
size_t.

[Lei Zhang, 2016/05/19 20:44:26]

Done.

+  CPDF_Path GetPath(size_t i) const { return m_pObject->m_PathList[i]; }
+  uint8_t GetClipType(size_t i) const { return m_pObject->m_TypeList[i]; }
+  uint32_t GetTextCount() const { return m_pObject->m_TextList.size(); }
+  CPDF_TextObject* GetText(size_t i) const {
+    return m_pObject->m_TextList[i].get();
+  }
   CFX_FloatRect GetClipBox() const;
 
-  void AppendPath(CPDF_Path path, int type, FX_BOOL bAutoMerge);
-  void DeletePath(int layer_index);
-
-  void AppendTexts(CPDF_TextObject** pTexts, int count);
+  void AppendPath(CPDF_Path path, uint8_t type, bool bAutoMerge);
+  void AppendTexts(std::vector<std::unique_ptr<CPDF_TextObject>>* pTexts);
   void Transform(const CFX_Matrix& matrix);
 };
 
 #endif  // CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_CLIPPATH_H_