From 6d8b1c2c7b1cbada20109f70ae971a4192330bb5 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 19 Jun 2015 17:26:17 -0700 Subject: Merge to XFA: Cleanup: Do not check pointers before deleting them. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1192743004. (cherry picked from commit cfac954abcab7caf47d3fa3d641c553cba998271) Review URL: https://codereview.chromium.org/1196783003. --- fpdfsdk/src/formfiller/FFL_IFormFiller.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'fpdfsdk/src/formfiller') diff --git a/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp b/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp index 4a5a7bcd96..d4ca0235b3 100644 --- a/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp +++ b/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp @@ -707,14 +707,11 @@ void CFFL_IFormFiller::RemoveFormFiller(CPDFSDK_Annot* pAnnot) void CFFL_IFormFiller::UnRegisterFormFiller(CPDFSDK_Annot* pAnnot) { - CFFL_FormFiller * pFormFiller = NULL; - - if (m_Maps.Lookup(pAnnot,pFormFiller)) - { - if (pFormFiller) - delete pFormFiller; - m_Maps.RemoveKey(pAnnot); - } + CFFL_FormFiller* pFormFiller = nullptr; + if (m_Maps.Lookup(pAnnot,pFormFiller)) { + delete pFormFiller; + m_Maps.RemoveKey(pAnnot); + } } void CFFL_IFormFiller::SetFocusAnnotTab(CPDFSDK_Annot* pWidget, FX_BOOL bSameField, FX_BOOL bNext) -- cgit v1.2.3