Do not check pointers before deleting them.

xfa/fxfa/parser/xfa_script_imp.cpp

Index: xfa/fxfa/parser/xfa_script_imp.cpp
diff --git a/xfa/fxfa/parser/xfa_script_imp.cpp b/xfa/fxfa/parser/xfa_script_imp.cpp
index ea16fd1e7c2919f831e9181d0832d4b7ee4a1b2e..b53a6e0493ff13b4a074e29941d23501eb594fcc 100644
--- a/xfa/fxfa/parser/xfa_script_imp.cpp
+++ b/xfa/fxfa/parser/xfa_script_imp.cpp
@@ -53,10 +53,7 @@ CXFA_ScriptContext::~CXFA_ScriptContext() {
     FXJSE_Context_Release(m_hJsContext);
     m_hJsContext = NULL;
   }
-  if (m_pResolveProcessor) {
-    delete m_pResolveProcessor;
-    m_pResolveProcessor = NULL;
-  }
+  delete m_pResolveProcessor;
   m_upObjectArray.RemoveAll();
   for (int32_t i = 0; i < m_CacheListArray.GetSize(); i++)
     delete m_CacheListArray[i];
@@ -516,10 +513,8 @@ void CXFA_ScriptContext::ReleaseVariablesMap() {
     m_mapVariableToHValue.GetNextAssoc(ps, pScriptNode, hVariableContext);
     FXJSE_HVALUE hObject = FXJSE_Context_GetGlobalObject(hVariableContext);
     CXFA_Object* lpCurNode = (CXFA_Object*)FXJSE_Value_ToObject(hObject, NULL);

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

Local not needed

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

Done.

-    if (lpCurNode) {
-      delete (CXFA_ThisProxy*)lpCurNode;
-      lpCurNode = NULL;
-    }
+    delete lpCurNode;

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

virtual dtor, I presume?

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

Sadly, no.

+    lpCurNode = nullptr;

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

Not needed, right?

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

Done.

     FXJSE_Value_Release(hObject);
     FXJSE_Context_Release(hVariableContext);
     hVariableContext = NULL;