Cleanup: Do not check pointers before deleting them, part 2.

fpdfsdk/src/formfiller/FFL_ComboBox.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 "../../include/formfiller/FormFiller.h"
 #include "../../include/formfiller/FFL_FormFiller.h"
 #include "../../include/formfiller/FFL_IFormFiller.h"
 #include "../../include/formfiller/FFL_CBA_Fontmap.h"
 #include "../../include/formfiller/FFL_ComboBox.h"
 
 
 /* ------------------------------- CFFL_ComboBox ------------------------------- */
 
 CFFL_ComboBox::CFFL_ComboBox(CPDFDoc_Environment* pApp, CPDFSDK_Annot* pAnnot) :
         CFFL_FormFiller(pApp, pAnnot), m_pFontMap( NULL )
 {
         m_State.nIndex = 0;
         m_State.nStart = 0;
         m_State.nEnd   = 0;
 }
 
 CFFL_ComboBox::~CFFL_ComboBox()
 {
-        if (m_pFontMap)
-        {
-                delete m_pFontMap;
-                m_pFontMap = NULL;
-        }
+    delete m_pFontMap;
+    m_pFontMap = NULL;

[Tom Sepez, 2015/07/16 17:22:44]

nit: pointless assignment?

[Lei Zhang, 2015/07/16 21:20:48]

Done.

 }
 
 PWL_CREATEPARAM CFFL_ComboBox::GetCreateParam()
 {
         PWL_CREATEPARAM cp = CFFL_FormFiller::GetCreateParam();
 
         ASSERT(m_pWidget != NULL);
 
         int nFlags = m_pWidget->GetFieldFlags();
 
@@ skipping 356 matching lines @@
                 if (CPDF_FormField * pFormField = m_pWidget->GetFormField())
                 {
                         swRet = pFormField->GetOptionValue(nExport);
                         if (swRet.IsEmpty())
                                 swRet = pFormField->GetOptionLabel(nExport);
                 }
         }
 
         return swRet;
 }