Do not check pointers before deleting them.

xfa/fxfa/parser/xfa_document_layout_imp.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/parser/xfa_document_layout_imp.h"
 
 #include "xfa/fxfa/fm2js/xfa_fm2jsapi.h"
 #include "xfa/fxfa/parser/xfa_basic_imp.h"
@@ skipping 24 matching lines @@
       m_pRootItemLayoutProcessor(NULL),
       m_pLayoutPageMgr(NULL),
       m_nProgressCounter(0),
       m_bNeeLayout(TRUE) {}
 CXFA_LayoutProcessor::~CXFA_LayoutProcessor() {
   ClearLayoutData();
 }
 CXFA_Document* CXFA_LayoutProcessor::GetDocument() const {
   return m_pDocument;
 }
+
 int32_t CXFA_LayoutProcessor::StartLayout(FX_BOOL bForceRestart) {
-  if (!bForceRestart && !IsNeedLayout()) {
+  if (!bForceRestart && !IsNeedLayout())
     return 100;
-  }
-  if (m_pRootItemLayoutProcessor) {
-    delete m_pRootItemLayoutProcessor;
-    m_pRootItemLayoutProcessor = NULL;
-  }
+
+  delete m_pRootItemLayoutProcessor;
+  m_pRootItemLayoutProcessor = nullptr;
   m_nProgressCounter = 0;
   CXFA_Node* pFormPacketNode =
       ToNode(m_pDocument->GetXFAObject(XFA_HASHCODE_Form));
   if (!pFormPacketNode) {
     return -1;
   }
   CXFA_Node* pFormRoot =
       pFormPacketNode->GetFirstChildByClass(XFA_ELEMENT_Subform);
   if (!pFormRoot) {
     return -1;
@@ skipping 77 matching lines @@
       pFormItem->GetUserData(XFA_LAYOUTITEMKEY));
 }
 void CXFA_LayoutProcessor::AddChangedContainer(CXFA_Node* pContainer) {
   if (m_rgChangedContainers.Find(pContainer) < 0) {
     m_rgChangedContainers.Add(pContainer);
   }
 }
 CXFA_ContainerLayoutItem* CXFA_LayoutProcessor::GetRootLayoutItem() const {
   return m_pLayoutPageMgr ? m_pLayoutPageMgr->GetRootLayoutItem() : NULL;
 }
+
 void CXFA_LayoutProcessor::ClearLayoutData() {
-  if (m_pLayoutPageMgr) {
-    delete m_pLayoutPageMgr;
-    m_pLayoutPageMgr = NULL;
-  }
-  if (m_pRootItemLayoutProcessor) {
-    delete m_pRootItemLayoutProcessor;
-    m_pRootItemLayoutProcessor = NULL;
-  }
+  delete m_pLayoutPageMgr;
+  m_pLayoutPageMgr = nullptr;
+  delete m_pRootItemLayoutProcessor;
+  m_pRootItemLayoutProcessor = nullptr;
   m_nProgressCounter = 0;
 }
+
 FX_BOOL CXFA_LayoutProcessor::IsNeedLayout() {
   return m_bNeeLayout || m_rgChangedContainers.GetSize() > 0;
 }
 CXFA_LayoutItem::CXFA_LayoutItem(CXFA_Node* pNode, FX_BOOL bIsContentLayoutItem)
     : m_pFormNode(pNode),
       m_pParent(NULL),
       m_pNextSibling(NULL),
       m_pFirstChild(NULL),
       m_bIsContentLayoutItem(bIsContentLayoutItem) {}
 CXFA_LayoutItem::~CXFA_LayoutItem() {}
@@ skipping 29 matching lines @@
 CXFA_ContentLayoutItem::CXFA_ContentLayoutItem(CXFA_Node* pNode)
     : CXFA_LayoutItem(pNode, TRUE),
       m_pPrev(NULL),
       m_pNext(NULL),
       m_dwStatus(0) {}
 CXFA_ContentLayoutItem::~CXFA_ContentLayoutItem() {
   if (m_pFormNode->GetUserData(XFA_LAYOUTITEMKEY) == this) {
     m_pFormNode->SetUserData(XFA_LAYOUTITEMKEY, NULL);
   }
 }