Use smart pointers for class owned member variables

core/fpdfdoc/cpdf_variabletext.cpp

 // 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
 
 #include "core/fpdfdoc/include/cpdf_variabletext.h"
 
 #include "core/fpdfapi/fpdf_font/include/cpdf_font.h"
 #include "core/fpdfdoc/cpvt_wordinfo.h"
@@ skipping 246 matching lines @@
       m_pVTProvider(nullptr) {}
 
 CPDF_VariableText::~CPDF_VariableText() {
   ResetAll();
 }
 
 void CPDF_VariableText::Initialize() {
   if (!m_bInitial) {
     CPVT_SectionInfo secinfo;
     if (m_bRichText) {
-      secinfo.pSecProps = new CPVT_SecProps(0.0f, 0.0f, 0);
-      secinfo.pWordProps = new CPVT_WordProps(
-          GetDefaultFontIndex(), kDefaultFontSize, 0, ScriptType::Normal, 0);
+      secinfo.pSecProps.reset(new CPVT_SecProps(0.0f, 0.0f, 0));
+      secinfo.pWordProps.reset(new CPVT_WordProps(
+          GetDefaultFontIndex(), kDefaultFontSize, 0, ScriptType::Normal, 0));
     }
     CPVT_WordPlace place;
     place.nSecIndex = 0;
     AddSection(place, secinfo);
     CPVT_LineInfo lineinfo;
     lineinfo.fLineAscent = GetFontAscent(GetDefaultFontIndex(), GetFontSize());
     lineinfo.fLineDescent =
         GetFontDescent(GetDefaultFontIndex(), GetFontSize());
     AddLine(place, lineinfo);
     if (CSection* pSection = m_SectionArray.GetAt(0))
@@ skipping 46 matching lines @@
     return place;
 
   CPVT_WordPlace wordplace = place;
   UpdateWordPlace(wordplace);
   CPVT_WordPlace newplace = place;
   if (CSection* pSection = m_SectionArray.GetAt(wordplace.nSecIndex)) {
     CPVT_WordPlace NewPlace(wordplace.nSecIndex + 1, 0, -1);
     CPVT_SectionInfo secinfo;
     if (m_bRichText) {
       if (pSecProps)
-        secinfo.pSecProps = new CPVT_SecProps(*pSecProps);
+        secinfo.pSecProps.reset(new CPVT_SecProps(*pSecProps));
       if (pWordProps)
-        secinfo.pWordProps = new CPVT_WordProps(*pWordProps);
+        secinfo.pWordProps.reset(new CPVT_WordProps(*pWordProps));
     }
     AddSection(NewPlace, secinfo);
     newplace = NewPlace;
     if (CSection* pNewSection = m_SectionArray.GetAt(NewPlace.nSecIndex)) {
       for (int32_t w = wordplace.nWordIndex + 1,
                    sz = pSection->m_WordArray.GetSize();
            w < sz; w++) {
         if (CPVT_WordInfo* pWord = pSection->m_WordArray.GetAt(w)) {
           NewPlace.nWordIndex++;
           pNewSection->AddWord(NewPlace, *pWord);
@@ skipping 70 matching lines @@
 void CPDF_VariableText::SetText(const FX_WCHAR* text,
                                 int32_t charset,
                                 const CPVT_SecProps* pSecProps,
                                 const CPVT_WordProps* pWordProps) {
   DeleteWords(CPVT_WordRange(GetBeginWordPlace(), GetEndWordPlace()));
   CFX_WideString swText = text;
   CPVT_WordPlace wp(0, 0, -1);
   CPVT_SectionInfo secinfo;
   if (m_bRichText) {
     if (pSecProps)
-      secinfo.pSecProps = new CPVT_SecProps(*pSecProps);
+      secinfo.pSecProps.reset(new CPVT_SecProps(*pSecProps));
     if (pWordProps)
-      secinfo.pWordProps = new CPVT_WordProps(*pWordProps);
+      secinfo.pWordProps.reset(new CPVT_WordProps(*pWordProps));
   }
   if (CSection* pSection = m_SectionArray.GetAt(0))
     pSection->m_SecInfo = secinfo;
 
   int32_t nCharCount = 0;
   for (int32_t i = 0, sz = swText.GetLength(); i < sz; i++) {
     if (m_nLimitChar > 0 && nCharCount >= m_nLimitChar)
       break;
     if (m_nCharArray > 0 && nCharCount >= m_nCharArray)
       break;
@@ skipping 708 matching lines @@
 
 CPDF_VariableText::Iterator* CPDF_VariableText::GetIterator() {
   if (!m_pVTIterator)
     m_pVTIterator.reset(new CPDF_VariableText::Iterator(this));
   return m_pVTIterator.get();
 }
 
 void CPDF_VariableText::SetProvider(CPDF_VariableText::Provider* pProvider) {
   m_pVTProvider = pProvider;
 }