Do not check pointers before deleting them.

xfa/fwl/theme/cfwl_checkboxtp.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 "xfa/fwl/theme/cfwl_checkboxtp.h"
 
 #include "xfa/fde/tto/fde_textout.h"
 #include "xfa/fwl/basewidget/ifwl_checkbox.h"
 #include "xfa/fwl/core/cfwl_themebackground.h"
 #include "xfa/fwl/core/cfwl_themetext.h"
 #include "xfa/fwl/core/ifwl_widget.h"
 #include "xfa/fxgraphics/cfx_color.h"
 #include "xfa/fxgraphics/cfx_path.h"
 
 #define CHECKBOX_SIZE_SIGNMARGIN 3
 #define CHECKBOX_SIZE_SIGNBORDER 2
 #define CHECKBOX_SIZE_SIGNPATH 100
 #define CHECKBOX_COLOR_BOXLT1 (ArgbEncode(255, 172, 168, 153))
 #define CHECKBOX_COLOR_BOXLT2 (ArgbEncode(255, 113, 111, 100))
 #define CHECKBOX_COLOR_BOXRB1 (ArgbEncode(255, 241, 239, 226))
 #define CHECKBOX_COLOR_BOXRB2 (ArgbEncode(255, 255, 255, 255))
 
-CFWL_CheckBoxTP::CFWL_CheckBoxTP() : m_pCheckPath(NULL) {
-  m_pThemeData = new CKBThemeData;
+CFWL_CheckBoxTP::CFWL_CheckBoxTP()
+    : m_pThemeData(new CKBThemeData), m_pCheckPath(nullptr) {
   SetThemeData(0);
 }
+
 CFWL_CheckBoxTP::~CFWL_CheckBoxTP() {
-  if (m_pThemeData) {
-    delete m_pThemeData;
-    m_pThemeData = NULL;
-  }
+  delete m_pThemeData;
   if (m_pCheckPath) {
     m_pCheckPath->Clear();
     delete m_pCheckPath;
-    m_pCheckPath = NULL;
+    m_pCheckPath = nullptr;

[Tom Sepez, 2016/04/28 21:47:22]

nit: probably not necessary.

[Lei Zhang, 2016/04/28 22:31:10]

Done.

   }
 }
+
 FX_BOOL CFWL_CheckBoxTP::IsValidWidget(IFWL_Widget* pWidget) {
   return pWidget && pWidget->GetClassID() == FWL_CLASSHASH_CheckBox;
 }
 uint32_t CFWL_CheckBoxTP::SetThemeID(IFWL_Widget* pWidget,
                                      uint32_t dwThemeID,
                                      FX_BOOL bChildren) {
   if (m_pThemeData) {
     SetThemeData(FWL_GetThemeColor(dwThemeID));
   }
   return CFWL_WidgetTP::SetThemeID(pWidget, dwThemeID, bChildren);
@@ skipping 450 matching lines @@
                            pt1.x + px2 * FWLTHEME_BEZIER,
                            pt1.y + py2 * FWLTHEME_BEZIER, pt1.x, pt1.y);
     FX_FLOAT fScale = fCheckLen / CHECKBOX_SIZE_SIGNPATH;
     CFX_Matrix mt;
     mt.Set(1, 0, 0, 1, 0, 0);
     mt.Scale(fScale, fScale);
     CFX_PathData* pData = m_pCheckPath->GetPathData();
     pData->Transform(&mt);
   }
 }