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

fpdfsdk/src/fpdfformfill.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 "../../public/fpdf_formfill.h"
 #include "../../public/fpdfview.h"
 #include "../../third_party/base/nonstd_unique_ptr.h"
 #include "../include/fsdk_define.h"
@@ skipping 211 matching lines @@
                 pContext = NULL;
                 pDevice = NULL;
                 return;
         }
         if(CPDFSDK_PageView* pPageView = pFXDoc->GetPageView(pPage))
         {
                 pPageView->PageView_OnDraw(pDevice, &matrix, &options);
         }
         pDevice->RestoreState();
 
-        if(options.m_pOCContext)
-        {
-                delete options.m_pOCContext;
-                options.m_pOCContext = NULL;
-        }
-        if(pContext)
-        {
-                delete pContext;
-                pContext = NULL;
-        }
-        if(pDevice)
-        {
-                delete pDevice;
-                pDevice = NULL;
-        }
+    delete options.m_pOCContext;

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

nit: funny indent.

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

merge resolved this.

+    options.m_pOCContext = NULL;
 
+    delete pContext;
+    pContext = NULL;

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

nit: pointless assignments?

+    delete pDevice;
+    pDevice = NULL;
 }
 
 DLLEXPORT void STDCALL FPDF_SetFormFieldHighlightColor(FPDF_FORMHANDLE hHandle, int fieldType, unsigned long color)
 {
         if (!hHandle)
                 return;
 //      CPDFDoc_Environment* pEnv = (CPDFDoc_Environment* )hHandle;
         CPDFSDK_Document* pSDKDoc = ((CPDFDoc_Environment*)hHandle)->GetCurrentDoc();
         if(pSDKDoc)
         {
@@ skipping 139 matching lines @@
                         if (bExistCAAction)
                         {
                                 CPDF_Action action = aa.GetAction(CPDF_AAction::ClosePage);
                                 pActionHandler->DoAction_Page(action, CPDF_AAction::ClosePage, pSDKDoc);
                         }
                 }
         }
 }