Do not check pointers before deleting them.

xfa/fxfa/app/xfa_ffpushbutton.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/fxfa/app/xfa_ffpushbutton.h"
 
 #include "xfa/fwl/core/fwl_noteimp.h"
 #include "xfa/fwl/core/fwl_widgetmgrimp.h"
@@ skipping 68 matching lines @@
       dwStyleEx = XFA_FWL_PSBSTYLEEXT_HiliteOutLine;
       break;
     case XFA_ATTRIBUTEENUM_Push:
       dwStyleEx = XFA_FWL_PSBSTYLEEXT_HilitePush;
       break;
     default:
       break;
   }
   m_pNormalWidget->ModifyStylesEx(dwStyleEx, 0xFFFFFFFF);
 }
+
 void CXFA_FFPushButton::UnloadWidget() {
-  if (m_pRolloverTextLayout) {
-    delete m_pRolloverTextLayout;
-    m_pRolloverTextLayout = NULL;
-  }
-  if (m_pDownTextLayout) {
-    delete m_pDownTextLayout;
-    m_pDownTextLayout = NULL;
-  }
-  if (m_pDownProvider) {
-    delete m_pDownProvider;
-    m_pDownProvider = NULL;
-  }
-  if (m_pRollProvider) {
-    delete m_pRollProvider;
-    m_pRollProvider = NULL;
-  }
+  delete m_pRolloverTextLayout;
+  m_pRolloverTextLayout = NULL;

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

nullptr.

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

Done.

+  delete m_pDownTextLayout;
+  m_pDownTextLayout = nullptr;
+  delete m_pDownProvider;
+  m_pDownProvider = nullptr;
+  delete m_pRollProvider;
+  m_pRollProvider = nullptr;
   CXFA_FFField::UnloadWidget();
 }
+
 FX_BOOL CXFA_FFPushButton::PerformLayout() {
   CXFA_FFWidget::PerformLayout();
   CFX_RectF rtWidget;
   GetRectWithoutRotate(rtWidget);
   m_rtUI = rtWidget;
   if (CXFA_Margin mgWidget = m_pDataAcc->GetMargin()) {
     XFA_RectWidthoutMargin(rtWidget, mgWidget);
   }
   CXFA_Caption caption = m_pDataAcc->GetCaption();
   m_rtCaption.Set(rtWidget.left, rtWidget.top, rtWidget.width, rtWidget.height);
@@ skipping 125 matching lines @@
       path.Create();
       CFX_RectF rect;
       m_pNormalWidget->GetWidgetRect(rect);
       path.AddRectangle(0, 0, rect.width, rect.height);
       pGraphics->StrokePath(&path, (CFX_Matrix*)pMatrix);
     }
   } else if (m_pNormalWidget->GetStylesEx() & XFA_FWL_PSBSTYLEEXT_HilitePush) {
   }
   return FWL_ERR_Succeeded;
 }